[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27246] branches/render25/source/blender/ editors: Render Branch: attempt to fix pthread compile errors on scons/ windows.

Brecht Van Lommel brecht at blender.org
Wed Mar 3 13:23:22 CET 2010


Revision: 27246
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27246
Author:   blendix
Date:     2010-03-03 13:23:21 +0100 (Wed, 03 Mar 2010)

Log Message:
-----------
Render Branch: attempt to fix pthread compile errors on scons/windows.

Modified Paths:
--------------
    branches/render25/source/blender/editors/space_image/SConscript
    branches/render25/source/blender/editors/space_view3d/SConscript

Modified: branches/render25/source/blender/editors/space_image/SConscript
===================================================================
--- branches/render25/source/blender/editors/space_image/SConscript	2010-03-03 11:48:03 UTC (rev 27245)
+++ branches/render25/source/blender/editors/space_image/SConscript	2010-03-03 12:23:21 UTC (rev 27246)
@@ -13,5 +13,7 @@
 	defs.append('WITH_LCMS')
 if env['WITH_BF_OPENEXR']:
 	defs.append('WITH_OPENEXR')
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+	incs += ' ' + env['BF_PTHREADS_INC']
 
 env.BlenderLib ( 'bf_editors_space_image', sources, Split(incs), defs, libtype=['core'], priority=[40] )

Modified: branches/render25/source/blender/editors/space_view3d/SConscript
===================================================================
--- branches/render25/source/blender/editors/space_view3d/SConscript	2010-03-03 11:48:03 UTC (rev 27245)
+++ branches/render25/source/blender/editors/space_view3d/SConscript	2010-03-03 12:23:21 UTC (rev 27246)
@@ -13,5 +13,7 @@
 
 if env['WITH_BF_GAMEENGINE']:
 	defs.append('GAMEBLENDER=1')
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+	incs += ' ' + env['BF_PTHREADS_INC']
 
 env.BlenderLib ( 'bf_editors_space_view3d', sources, Split(incs), defines = defs, libtype=['core'], priority=[40] )





More information about the Bf-blender-cvs mailing list