[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40364] trunk/blender/source/blender/imbuf /SConscript: attempt to fix windows/scons issue I caused in a recent commit .

Campbell Barton ideasman42 at gmail.com
Mon Sep 19 17:18:59 CEST 2011


Revision: 40364
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40364
Author:   campbellbarton
Date:     2011-09-19 15:18:58 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
attempt to fix windows/scons issue I caused in a recent commit.

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/SConscript

Modified: trunk/blender/source/blender/imbuf/SConscript
===================================================================
--- trunk/blender/source/blender/imbuf/SConscript	2011-09-19 15:13:16 UTC (rev 40363)
+++ trunk/blender/source/blender/imbuf/SConscript	2011-09-19 15:18:58 UTC (rev 40364)
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+import os
 Import ('env')
 
 sources = env.Glob('intern/*.c')
@@ -23,7 +24,7 @@
 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_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 @@
     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')




More information about the Bf-blender-cvs mailing list