diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2012-05-10 13:05:03 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2012-05-10 13:05:03 +0400 |
| commit | 03747781a8b1027eb78914a2b92f289c10558226 (patch) | |
| tree | f87e8349ebe8b989fa0e1005203358f0df8e0917 | |
| parent | 00460458d0cb06d3358c08621b45cb7c8b4548d3 (diff) | |
| parent | 88750597c741389af7dec62606a02ff02465c71e (diff) | |
Merge 46051-46053 to ensure compilation on Windowsv2.63a
| -rw-r--r-- | source/gameengine/BlenderRoutines/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/gameengine/BlenderRoutines/SConscript | 3 | ||||
| -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 |
6 files changed, 12 insertions, 1 deletions
diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt index 5a7304765e4..96b56768b8f 100644 --- a/source/gameengine/BlenderRoutines/CMakeLists.txt +++ b/source/gameengine/BlenderRoutines/CMakeLists.txt @@ -32,7 +32,7 @@ set(INC ) set(INC_SYS - + ${PTHREADS_INCLUDE_DIRS} ) set(SRC diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript index 8f59ec0bf04..998396aba7c 100644 --- a/source/gameengine/BlenderRoutines/SConscript +++ b/source/gameengine/BlenderRoutines/SConscript @@ -35,4 +35,7 @@ if env['WITH_BF_CXX_GUARDEDALLOC']: incs += ' ' + env['BF_BULLET_INC'] incs += ' ' + env['BF_OPENGL_INC'] +if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): + incs += ' ' + env['BF_PTHREADS_INC'] + env.BlenderLib ( 'ge_blen_routines', sources, Split(incs), defs, libtype=['core','player'], priority=[300,35] , cxx_compileflags=env['BGE_CXXFLAGS']) 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']) |