Revision: 28194
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28194
Author: dingto
Date: 2010-04-14 19:15:33 +0200 (Wed, 14 Apr 2010)
Log Message:
-----------
Fixing Scons compile on Windows:
*Missed PTHREAD declaration.
Modified Paths:
--------------
trunk/blender/source/blender/gpu/SConscript
trunk/blender/source/creator/SConscript
Modified: trunk/blender/source/blender/gpu/SConscript
===================================================================
--- trunk/blender/source/blender/gpu/SConscript 2010-04-14 16:59:33 UTC (rev
28193)
+++ trunk/blender/source/blender/gpu/SConscript 2010-04-14 17:15:33 UTC (rev
28194)
@@ -8,6 +8,9 @@
incs = '../blenlib ../blenkernel ../makesdna ../include'
incs += ' #/extern/glew/include #intern/guardedalloc #intern/smoke/extern
../imbuf .'
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+ incs += ' ' + env['BF_PTHREADS_INC']
+
incs += ' ' + env['BF_OPENGL_INC']
env.BlenderLib ( 'bf_gpu', sources, Split(incs), defines = defs,
libtype=['core','player'], priority=[160,110] )
Modified: trunk/blender/source/creator/SConscript
===================================================================
--- trunk/blender/source/creator/SConscript 2010-04-14 16:59:33 UTC (rev
28193)
+++ trunk/blender/source/creator/SConscript 2010-04-14 17:15:33 UTC (rev
28194)
@@ -39,5 +39,8 @@
if env['BF_BUILDINFO']:
defs.append('BUILD_DATE')
defs.append('NAN_BUILDINFO')
+
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+ incs += ' ' + env['BF_PTHREADS_INC']
env.BlenderLib ( libname = 'bf_creator', sources = Split(sources), includes =
Split(incs), defines = defs, libtype='core', priority = 0 )
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
