Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-09-19 19:18:58 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-09-19 19:18:58 +0400
commitd78231734d6ccf224738ea76307c26f8c0d4dab4 (patch)
treee4d825b36da66fdd4850f2c5ca4dc5c1389010d8
parent05683f8e52119198c3ee053dd0a107caf83859b1 (diff)
attempt to fix windows/scons issue I caused in a recent commit.
-rw-r--r--source/blender/imbuf/SConscript7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index 7c5b94b9e12..eae9665d23b 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -1,4 +1,5 @@
#!/usr/bin/python
+import os
Import ('env')
sources = env.Glob('intern/*.c')
@@ -23,7 +24,7 @@ if env['WITH_BF_OPENEXR']:
if env['WITH_BF_TIFF']:
defs.append('WITH_TIFF')
else:
- sources.remove('intern/tiff.c')
+ sources.remove(os.path.join('intern', 'tiff.c'))
if env['WITH_BF_DDS']:
defs.append('WITH_DDS')
@@ -34,7 +35,7 @@ if env['WITH_BF_CINEON']:
if env['WITH_BF_HDR']:
defs.append('WITH_HDR')
else:
- sources.remove('intern/radiance_hdr.c')
+ sources.remove(os.path.join('intern', 'radiance_hdr.c'))
if env['WITH_BF_FFMPEG']:
defs.append('WITH_FFMPEG')
@@ -44,7 +45,7 @@ if env['WITH_BF_OPENJPEG']:
defs.append('WITH_OPENJPEG')
incs += ' ' + env['BF_OPENJPEG_INC']
else:
- sources.remove('intern/jp2.c')
+ sources.remove(os.path.join('intern', 'jp2.c'))
if env['WITH_BF_REDCODE']:
defs.append('WITH_REDCODE')