diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2012-04-29 02:59:55 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2012-04-29 02:59:55 +0400 |
| commit | 5abadf1f75d7d364f3f770f2c2a14e037b5cb73b (patch) | |
| tree | 138056880e69bd7d79daa5ef239acec1f376a804 /source/gameengine | |
| parent | 8bf8a128c2f1df5c85ee0005d1821316d3e88261 (diff) | |
Fix for windows compile.
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Converter/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/gameengine/Converter/SConscript | 3 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/SConscript | 3 |
4 files changed, 8 insertions, 0 deletions
diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt index b570489d6a2..1826f1ad25b 100644 --- a/source/gameengine/Converter/CMakeLists.txt +++ b/source/gameengine/Converter/CMakeLists.txt @@ -59,6 +59,7 @@ set(INC ) set(INC_SYS + ${PTHREADS_INCLUDE_DIRS} ) diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript index 4e2adbdc021..e95ae5448fb 100644 --- a/source/gameengine/Converter/SConscript +++ b/source/gameengine/Converter/SConscript @@ -39,4 +39,7 @@ if env['WITH_BF_CXX_GUARDEDALLOC']: 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']) diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index 8ed2d2f46db..c7f54838c10 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -55,6 +55,7 @@ set(INC ) set(INC_SYS + ${PTHREADS_INCLUDE_DIRS} ${GLEW_INCLUDE_PATH} ../../../extern/recastnavigation/Recast/Include ../../../extern/recastnavigation/Detour/Include diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 2943acd546d..5fdf250006f 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -47,4 +47,7 @@ if env['WITH_BF_BULLET']: 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']) |