sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

attempt to fix windows/scons issue I caused in a recent commit.

Browse Source
This commit is contained in:
Campbell Barton 2011-09-19 15:18:58 +00:00
parent 05683f8e52
commit d78231734d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/imbuf/SConscript
View File

@ -1,4 +1,5 @@
#!/usr/bin/python #!/usr/bin/python
import os
Import ('env') Import ('env')
sources = env.Glob('intern/*.c') sources = env.Glob('intern/*.c')
@ -23,7 +24,7 @@ if env['WITH_BF_OPENEXR']:
if env['WITH_BF_TIFF']: if env['WITH_BF_TIFF']:
defs.append('WITH_TIFF') defs.append('WITH_TIFF')
else: else:
sources.remove('intern/tiff.c') sources.remove(os.path.join('intern', 'tiff.c'))
if env['WITH_BF_DDS']: if env['WITH_BF_DDS']:
defs.append('WITH_DDS') defs.append('WITH_DDS')
@ -34,7 +35,7 @@ if env['WITH_BF_CINEON']:
if env['WITH_BF_HDR']: if env['WITH_BF_HDR']:
defs.append('WITH_HDR') defs.append('WITH_HDR')
else: else:
sources.remove('intern/radiance_hdr.c') sources.remove(os.path.join('intern', 'radiance_hdr.c'))
if env['WITH_BF_FFMPEG']: if env['WITH_BF_FFMPEG']:
defs.append('WITH_FFMPEG') defs.append('WITH_FFMPEG')
@ -44,7 +45,7 @@ if env['WITH_BF_OPENJPEG']:
defs.append('WITH_OPENJPEG') defs.append('WITH_OPENJPEG')
incs += ' ' + env['BF_OPENJPEG_INC'] incs += ' ' + env['BF_OPENJPEG_INC']
else: else:
sources.remove('intern/jp2.c') sources.remove(os.path.join('intern', 'jp2.c'))
if env['WITH_BF_REDCODE']: if env['WITH_BF_REDCODE']:
defs.append('WITH_REDCODE') defs.append('WITH_REDCODE')