Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitchell Stokes <mogurijin@gmail.com>2013-07-20 05:15:36 +0400
committerMitchell Stokes <mogurijin@gmail.com>2013-07-20 05:15:36 +0400
commit81769b4f58b690799990db87eec217d0423a16e0 (patch)
tree07db1ee04c482048ad978f343fdc7be506a12270 /source/gameengine
parente3c3a6e2c8a1532872b16308df42442b450667e4 (diff)
More build fixes for r58428.
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/GamePlayer/common/CMakeLists.txt1
-rw-r--r--source/gameengine/GamePlayer/common/SConscript1
-rw-r--r--source/gameengine/GamePlayer/ghost/SConscript1
3 files changed, 2 insertions, 1 deletions
diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt
index 4f2531cec2a..ef3066e319b 100644
--- a/source/gameengine/GamePlayer/common/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/common/CMakeLists.txt
@@ -57,6 +57,7 @@ set(INC_SYS
${PYTHON_INCLUDE_DIRS}
${PNG_INCLUDE_DIR}
${ZLIB_INCLUDE_DIRS}
+ ${BOOST_INCLUDE_DIR}
)
set(SRC
diff --git a/source/gameengine/GamePlayer/common/SConscript b/source/gameengine/GamePlayer/common/SConscript
index e04d9e18e82..85c4b091718 100644
--- a/source/gameengine/GamePlayer/common/SConscript
+++ b/source/gameengine/GamePlayer/common/SConscript
@@ -78,6 +78,5 @@ if env['WITH_BF_PYTHON']:
incs.extend(Split(env['BF_PNG_INC']))
incs.extend(Split(env['BF_ZLIB_INC']))
-incs += ' ' + env['BF_BOOST_INC']
env.BlenderLib (libname='ge_player_common', sources=source_files, includes=incs, defines = defs, libtype=['player'], priority=[5], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript
index 7420218ffbb..1b1d1fc1d91 100644
--- a/source/gameengine/GamePlayer/ghost/SConscript
+++ b/source/gameengine/GamePlayer/ghost/SConscript
@@ -71,6 +71,7 @@ incs = [
]
incs.append(env['BF_PTHREADS_INC'])
+incs.append(env['BF_BOOST_INC'])
defs = [
'GLEW_STATIC',