← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/blender/intrepid-updates

« back to all changes in this revision

Viewing changes to source/blender/blenkernel/SConscript

  • Committer: Bazaar Package Importer
  • Author(s): Cyril Brulebois
  • Date: 2008-08-08 02:45:40 UTC
  • mfrom: (12.1.14 intrepid)
  • Revision ID: james.westby@ubuntu.com-20080808024540-kkjp7ekfivzhuw3l
Tags: 2.46+dfsg-4
http://bugs.debian.org/492280
* Fix python syntax warning in import_dxf.py, which led to nasty output
  in installation/upgrade logs during byte-compilation, using a patch
  provided by the script author (Closes: #492280):
   - debian/patches/45_fix_python_syntax_warning

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/blenkernel/SConscript
5
5
 
6
6
incs = '. #/intern/guardedalloc ../include ../blenlib ../makesdna'
7
7
incs += ' ../python ../render/extern/include #/intern/decimation/extern'
8
 
incs += ' ../imbuf ../avi #/intern/elbeem/extern'
 
8
incs += ' ../imbuf ../avi #/intern/elbeem/extern ../nodes'
9
9
incs += ' #/intern/iksolver/extern ../blenloader ../quicktime'
 
10
incs += ' #/extern/bullet2/src'
 
11
incs += ' #/intern/bmfont'
 
12
incs += ' #/intern/opennl/extern'
10
13
 
 
14
incs += ' ' + env['BF_PYTHON_INC']
11
15
incs += ' ' + env['BF_OPENGL_INC']
12
16
incs += ' ' + env['BF_ZLIB_INC']
13
17
incs += ' ' + env['BF_SDL_INC']
14
18
 
15
19
defs = ''
16
20
 
17
 
if env['WITH_BF_INTERNATIONAL'] == 1:
18
 
    defs += 'WITH_FREETYPE2'
19
 
 
 
21
if env['WITH_BF_INTERNATIONAL']:
 
22
        defs += 'WITH_FREETYPE2'
 
23
 
 
24
if env['WITH_BF_VERSE']:
 
25
        defs += ' WITH_VERSE'
 
26
        incs += ' ' + env['BF_VERSE_INCLUDE']
 
27
 
 
28
if env['WITH_BF_VERSE']:
 
29
        defs += ' WITH_VERSE'
 
30
        
20
31
if env['WITH_BF_OPENEXR'] == 1:
21
32
    defs += ' WITH_OPENEXR'
22
33
 
 
34
if env['WITH_BF_DDS'] == 1:
 
35
    defs += ' WITH_DDS'
 
36
 
23
37
if env['WITH_BF_FFMPEG'] == 1:
24
38
    defs += ' WITH_FFMPEG'
 
39
    incs += ' ' + env['BF_FFMPEG_INC']
25
40
 
26
41
if env['WITH_BF_QUICKTIME'] == 1:
27
42
    defs += ' WITH_QUICKTIME'