From e1ab3cf48074f9ba8740dbd5714f9f2c41e3919f Mon Sep 17 00:00:00 2001 From: Michel Selten Date: Sun, 22 Feb 2004 19:01:12 +0000 Subject: SCons updates * Game engine can now be build on Linux. By default this feature is disabled. The reason is that you need to have a precompiled version of the ode library for your gcc version. To enable ode support you need to do the following: - compile ode. - set BUILD_GAMEENGINE = 'true' in the config.opts file. - set USE_PHYSICS='ode' in the config.opts file. - set the ODE_INCLUDE and ODE_LIBPATH to valid locations. * Linking order has changed for the game engine There are cyclic dependencies between libraries. On linux we have to do some duplicate linking. I looked at the order of linking in source/Makefile, and did some clean up. --- source/gameengine/Physics/BlOde/SConscript | 2 +- source/gameengine/SConscript | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'source') diff --git a/source/gameengine/Physics/BlOde/SConscript b/source/gameengine/Physics/BlOde/SConscript index 5048d163731..03be5c12b46 100755 --- a/source/gameengine/Physics/BlOde/SConscript +++ b/source/gameengine/Physics/BlOde/SConscript @@ -15,6 +15,6 @@ source_files = ['OdePhysicsController.cpp', phy_ode_env.Append (CPPPATH=['.', '../common', ]) -phy_ode_env.Append (CPPPATH=['ODE_INCLUDE']) +phy_ode_env.Append (CPPPATH=user_options_dict['ODE_INCLUDE']) phy_ode_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Ode', source=source_files) diff --git a/source/gameengine/SConscript b/source/gameengine/SConscript index 1984c121b00..ebe66a15312 100644 --- a/source/gameengine/SConscript +++ b/source/gameengine/SConscript @@ -16,6 +16,5 @@ SConscript(['BlenderRoutines/SConscript', if user_options_dict['USE_PHYSICS'] == 'solid': SConscript(['Physics/Sumo/SConscript']) - -if user_options_dict['USE_PHYSICS'] == 'ode': +elif user_options_dict['USE_PHYSICS'] == 'ode': SConscript(['Physics/BlOde/SConscript']) -- cgit v1.2.3