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>2004-03-23 01:02:18 +0300
committerNathan Letwory <nathan@letworyinteractive.com>2004-03-23 01:02:18 +0300
commit00291b5cf4a0f16ddca425b74ed30e8ac35d40e2 (patch)
tree952bb1c2f6fd8c2f34b950597ed0fa73a4ea7594 /source/gameengine/Physics/Sumo/SConscript
parent5b90aafbd6815e29343f8e9aba9e3e20f85b3cc0 (diff)
[GameEngine] Commit all Kester's changes made to the gameengine to restore 2.25 like physics.
[SCons] Build with Solid as default when enabling the gameengine in the build process [SCons] Build solid and qhull from the extern directory and link statically against them That was about it. There are a few things that needs double checking: * Makefiles * Projectfiles * All the other systems than Linux and Windows on which the build (with scons) has been successfully tested.
Diffstat (limited to 'source/gameengine/Physics/Sumo/SConscript')
-rwxr-xr-xsource/gameengine/Physics/Sumo/SConscript6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/gameengine/Physics/Sumo/SConscript b/source/gameengine/Physics/Sumo/SConscript
index c58e98ca4ce..dba05693c1e 100755
--- a/source/gameengine/Physics/Sumo/SConscript
+++ b/source/gameengine/Physics/Sumo/SConscript
@@ -1,3 +1,4 @@
+import sys
Import ('user_options_dict')
Import ('library_env')
@@ -15,6 +16,9 @@ phy_sumo_env.Append (CPPPATH = ['.',
'#/intern/moto/include'
])
-phy_sumo_env.Append (CPPPATH = user_options_dict['solid_include'])
+phy_sumo_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE'])
+
+if sys.platform=='win32':
+ phy_sumo_env.Append (CXXFLAGS = ['/GR'])
phy_sumo_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Sumo', source=source_files)