[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51915] trunk/blender/source/gameengine: Compile fixes for recent boost changes
Antony Riakiotakis
kalast at gmail.com
Mon Nov 5 16:23:12 CET 2012
Revision: 51915
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51915
Author: psy-fi
Date: 2012-11-05 15:23:09 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
Compile fixes for recent boost changes
Modified Paths:
--------------
trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
trunk/blender/source/gameengine/BlenderRoutines/SConscript
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/BlenderRoutines/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt 2012-11-05 15:13:54 UTC (rev 51914)
+++ trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt 2012-11-05 15:23:09 UTC (rev 51915)
@@ -33,6 +33,7 @@
../../../extern/bullet2/src
${PTHREADS_INCLUDE_DIRS}
${GLEW_INCLUDE_PATH}
+ ${BOOST_INCLUDE_DIR}
)
set(SRC
Modified: trunk/blender/source/gameengine/BlenderRoutines/SConscript
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/SConscript 2012-11-05 15:13:54 UTC (rev 51914)
+++ trunk/blender/source/gameengine/BlenderRoutines/SConscript 2012-11-05 15:23:09 UTC (rev 51915)
@@ -34,6 +34,7 @@
incs += ' ' + env['BF_BULLET_INC']
incs += ' ' + env['BF_OPENGL_INC']
+incs += ' ' + env['BF_BOOST_INC']
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
incs += ' ' + env['BF_PTHREADS_INC']
Modified: trunk/blender/source/gameengine/Converter/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/Converter/CMakeLists.txt 2012-11-05 15:13:54 UTC (rev 51914)
+++ trunk/blender/source/gameengine/Converter/CMakeLists.txt 2012-11-05 15:23:09 UTC (rev 51915)
@@ -59,7 +59,7 @@
../../../extern/recastnavigation/Detour/Include
../../../extern/Eigen3
${PTHREADS_INCLUDE_DIRS}
-
+ ${BOOST_INCLUDE_DIR}
)
set(SRC
Modified: trunk/blender/source/gameengine/Converter/SConscript
===================================================================
--- trunk/blender/source/gameengine/Converter/SConscript 2012-11-05 15:13:54 UTC (rev 51914)
+++ trunk/blender/source/gameengine/Converter/SConscript 2012-11-05 15:23:09 UTC (rev 51915)
@@ -24,6 +24,7 @@
incs += ' #extern/Eigen3'
incs += ' ' + env['BF_BULLET_INC']
+incs += ' ' + env['BF_BOOST_INC']
if env['BF_DEBUG']:
if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc', 'win64-vc', 'win64-mingw'):
Modified: trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/Ketsji/CMakeLists.txt 2012-11-05 15:13:54 UTC (rev 51914)
+++ trunk/blender/source/gameengine/Ketsji/CMakeLists.txt 2012-11-05 15:23:09 UTC (rev 51915)
@@ -57,6 +57,7 @@
set(INC_SYS
${PTHREADS_INCLUDE_DIRS}
${GLEW_INCLUDE_PATH}
+ ${BOOST_INCLUDE_DIR}
../../../extern/recastnavigation/Recast/Include
../../../extern/recastnavigation/Detour/Include
)
Modified: trunk/blender/source/gameengine/Ketsji/SConscript
===================================================================
--- trunk/blender/source/gameengine/Ketsji/SConscript 2012-11-05 15:13:54 UTC (rev 51914)
+++ trunk/blender/source/gameengine/Ketsji/SConscript 2012-11-05 15:23:09 UTC (rev 51915)
@@ -24,6 +24,7 @@
incs += ' ' + env['BF_BULLET_INC']
incs += ' ' + env['BF_OPENGL_INC']
+incs += ' ' + env['BF_BOOST_INC']
if env['WITH_BF_SDL']:
incs += ' ' + env['BF_SDL_INC']
More information about the Bf-blender-cvs
mailing list