[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46051] trunk/blender/source/gameengine: Fix for windows compile.

Joerg Mueller nexyon at gmail.com
Sun Apr 29 00:59:56 CEST 2012


Revision: 46051
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46051
Author:   nexyon
Date:     2012-04-28 22:59:55 +0000 (Sat, 28 Apr 2012)
Log Message:
-----------
Fix for windows compile.

Modified Paths:
--------------
    trunk/blender/source/gameengine/Converter/CMakeLists.txt
    trunk/blender/source/gameengine/Converter/SConscript
    trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
    trunk/blender/source/gameengine/Ketsji/SConscript

Modified: trunk/blender/source/gameengine/Converter/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/Converter/CMakeLists.txt	2012-04-28 21:46:43 UTC (rev 46050)
+++ trunk/blender/source/gameengine/Converter/CMakeLists.txt	2012-04-28 22:59:55 UTC (rev 46051)
@@ -59,6 +59,7 @@
 )
 
 set(INC_SYS
+	${PTHREADS_INCLUDE_DIRS}
 
 )
 

Modified: trunk/blender/source/gameengine/Converter/SConscript
===================================================================
--- trunk/blender/source/gameengine/Converter/SConscript	2012-04-28 21:46:43 UTC (rev 46050)
+++ trunk/blender/source/gameengine/Converter/SConscript	2012-04-28 22:59:55 UTC (rev 46051)
@@ -39,4 +39,7 @@
 if env['WITH_BF_BULLET']:
     defs.append('USE_BULLET')
 
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
+    incs += ' ' + env['BF_PTHREADS_INC']
+
 env.BlenderLib ( 'ge_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,40], cxx_compileflags=env['BGE_CXXFLAGS'])

Modified: trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/Ketsji/CMakeLists.txt	2012-04-28 21:46:43 UTC (rev 46050)
+++ trunk/blender/source/gameengine/Ketsji/CMakeLists.txt	2012-04-28 22:59:55 UTC (rev 46051)
@@ -55,6 +55,7 @@
 )
 
 set(INC_SYS
+	${PTHREADS_INCLUDE_DIRS}
 	${GLEW_INCLUDE_PATH}
 	../../../extern/recastnavigation/Recast/Include
 	../../../extern/recastnavigation/Detour/Include

Modified: trunk/blender/source/gameengine/Ketsji/SConscript
===================================================================
--- trunk/blender/source/gameengine/Ketsji/SConscript	2012-04-28 21:46:43 UTC (rev 46050)
+++ trunk/blender/source/gameengine/Ketsji/SConscript	2012-04-28 22:59:55 UTC (rev 46051)
@@ -47,4 +47,7 @@
     defs.append('USE_BULLET')
     incs += ' #source/gameengine/Physics/Bullet'
 
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
+    incs += ' ' + env['BF_PTHREADS_INC']
+
 env.BlenderLib ( 'ge_logic_ketsji', sources, Split(incs), defs, libtype=['core','player'], priority=[320,45], cxx_compileflags=env['BGE_CXXFLAGS'])




More information about the Bf-blender-cvs mailing list