← Back to branch summary

~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

Viewing changes to source/blender/render/SConscript

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
https://launchpad.net/bugs/382153
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/render/SConscript
6
6
 
7
7
incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna'
8
8
incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf'
9
 
incs += ' ../quicktime ../include ../../kernel/gen_messaging ../blenloader'
 
9
incs += ' ../include ../blenloader'
10
10
 
11
11
defs = []
12
12
 
17
17
 
18
18
if env['WITH_BF_QUICKTIME']:
19
19
    defs.append('WITH_QUICKTIME')
20
 
    incs += ' ' + env['BF_QUICKTIME_INC']
 
20
    incs += ' ../quicktime ' + env['BF_QUICKTIME_INC']
21
21
 
22
22
if env['WITH_BF_FFMPEG']:
23
23
    defs.append('WITH_FFMPEG')