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:
authorNathan Letwory <nathan@letworyinteractive.com>2012-05-10 13:05:03 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2012-05-10 13:05:03 +0400
commit03747781a8b1027eb78914a2b92f289c10558226 (patch)
treef87e8349ebe8b989fa0e1005203358f0df8e0917 /source/gameengine/Converter/SConscript
parent00460458d0cb06d3358c08621b45cb7c8b4548d3 (diff)
parent88750597c741389af7dec62606a02ff02465c71e (diff)
Merge 46051-46053 to ensure compilation on Windowsv2.63a
Diffstat (limited to 'source/gameengine/Converter/SConscript')
-rw-r--r--source/gameengine/Converter/SConscript3
1 files changed, 3 insertions, 0 deletions
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'])