diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2012-11-05 19:23:09 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2012-11-05 19:23:09 +0400 |
commit | 8d0b2bc17f141367a5fe5570b8e344369aded585 (patch) | |
tree | 0fdbcc2e03df7b952ab6d3ff6eeebd4469e43157 /source/gameengine | |
parent | b2f837896d56df26c3d2b8bfd5596010c0f26ccf (diff) |
Compile fixes for recent boost changes
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/BlenderRoutines/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/gameengine/BlenderRoutines/SConscript | 1 | ||||
-rw-r--r-- | source/gameengine/Converter/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/gameengine/Converter/SConscript | 1 | ||||
-rw-r--r-- | source/gameengine/Ketsji/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/gameengine/Ketsji/SConscript | 1 |
6 files changed, 6 insertions, 1 deletions
diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt index a053e069153..9a47d223f76 100644 --- a/source/gameengine/BlenderRoutines/CMakeLists.txt +++ b/source/gameengine/BlenderRoutines/CMakeLists.txt @@ -33,6 +33,7 @@ set(INC_SYS ../../../extern/bullet2/src ${PTHREADS_INCLUDE_DIRS} ${GLEW_INCLUDE_PATH} + ${BOOST_INCLUDE_DIR} ) set(SRC diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript index 998396aba7c..04dbe27337f 100644 --- a/source/gameengine/BlenderRoutines/SConscript +++ b/source/gameengine/BlenderRoutines/SConscript @@ -34,6 +34,7 @@ if env['WITH_BF_CXX_GUARDEDALLOC']: 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'] diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt index 7b801fd4ffb..e9dd97f3821 100644 --- a/source/gameengine/Converter/CMakeLists.txt +++ b/source/gameengine/Converter/CMakeLists.txt @@ -59,7 +59,7 @@ set(INC_SYS ../../../extern/recastnavigation/Detour/Include ../../../extern/Eigen3 ${PTHREADS_INCLUDE_DIRS} - + ${BOOST_INCLUDE_DIR} ) set(SRC diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript index e95ae5448fb..bfd44dc90fc 100644 --- a/source/gameengine/Converter/SConscript +++ b/source/gameengine/Converter/SConscript @@ -24,6 +24,7 @@ incs += ' #extern/recastnavigation/Detour/Include' 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'): diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index 4778a6ef9b9..2eada3e5071 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -57,6 +57,7 @@ set(INC set(INC_SYS ${PTHREADS_INCLUDE_DIRS} ${GLEW_INCLUDE_PATH} + ${BOOST_INCLUDE_DIR} ../../../extern/recastnavigation/Recast/Include ../../../extern/recastnavigation/Detour/Include ) diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 5fdf250006f..88689a5a736 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -24,6 +24,7 @@ incs += ' #extern/recastnavigation/Recast/Include #extern/recastnavigation/Detou 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'] |