diff options
Diffstat (limited to 'source/gameengine/Physics')
-rw-r--r-- | source/gameengine/Physics/Bullet/SConscript | 24 | ||||
-rwxr-xr-x | source/gameengine/Physics/Dummy/SConscript | 13 | ||||
-rwxr-xr-x | source/gameengine/Physics/Sumo/SConscript | 31 | ||||
-rwxr-xr-x | source/gameengine/Physics/common/SConscript | 16 |
4 files changed, 31 insertions, 53 deletions
diff --git a/source/gameengine/Physics/Bullet/SConscript b/source/gameengine/Physics/Bullet/SConscript index 8d82f346757..b9d7bed8880 100644 --- a/source/gameengine/Physics/Bullet/SConscript +++ b/source/gameengine/Physics/Bullet/SConscript @@ -1,22 +1,16 @@ #!/usr/bin/python import sys -Import ('user_options_dict') -Import ('library_env') +Import ('env') -phy_bullet_env = library_env.Copy () +sources = 'CcdPhysicsEnvironment.cpp CcdPhysicsController.cpp' -source_files = ['CcdPhysicsEnvironment.cpp', - 'CcdPhysicsController.cpp' - ] +incs = '. ../common' -phy_bullet_env.Append (CPPPATH=['.', - '../common']) +incs += ' ' + env['BF_BULLET_INC'] -phy_bullet_env.Append (CPPPATH = user_options_dict['BULLET_INCLUDE']) +#TODO: +#if sys.platform=='win32': +# phy_bullet_env.Append (CXXFLAGS = ['/GR']) +# phy_bullet_env.Append (CCFLAGS =['/O2']) - -if sys.platform=='win32': - phy_bullet_env.Append (CXXFLAGS = ['/GR']) - phy_bullet_env.Append (CCFLAGS =['/O2']) - -phy_bullet_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Bullet', source=source_files) +env.BlenderLib ( 'PHY_Bullet', Split(sources), Split(incs), [], libtype='game', priority=15 ) diff --git a/source/gameengine/Physics/Dummy/SConscript b/source/gameengine/Physics/Dummy/SConscript index b5a642d4f9a..781e88e456f 100755 --- a/source/gameengine/Physics/Dummy/SConscript +++ b/source/gameengine/Physics/Dummy/SConscript @@ -1,13 +1,8 @@ #!/usr/bin/python -Import ('user_options_dict') -Import ('library_env') +Import ('env') -phy_dummy_env = library_env.Copy () +sources = 'DummyPhysicsEnvironment.cpp' -source_files = ['DummyPhysicsEnvironment.cpp'] +incs = '. ../common' -phy_dummy_env.Append (CPPPATH = ['.', - '../common' - ]) - -phy_dummy_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Dummy', source=source_files) +env.BlenderLib ( 'PHY_Dummy', Split(sources), Split(incs), [], libtype='game', priority=10 ) diff --git a/source/gameengine/Physics/Sumo/SConscript b/source/gameengine/Physics/Sumo/SConscript index b502a1ec616..7407aec469d 100755 --- a/source/gameengine/Physics/Sumo/SConscript +++ b/source/gameengine/Physics/Sumo/SConscript @@ -1,11 +1,8 @@ #!/usr/bin/python -import sys -Import ('user_options_dict') -Import ('library_env') +Import ('env') -phy_sumo_env = library_env.Copy () - -source_files = ['SumoPHYCallbackBridge.cpp', +sumoenv = env.Copy() +sources = ['SumoPHYCallbackBridge.cpp', 'SumoPhysicsController.cpp', 'SumoPhysicsEnvironment.cpp', 'Fuzzics/src/SM_FhObject.cpp', @@ -14,16 +11,16 @@ source_files = ['SumoPHYCallbackBridge.cpp', 'Fuzzics/src/SM_MotionState.cpp' ] -phy_sumo_env.Append (CPPPATH = ['.', - '../common', - 'Fuzzics/include', - '#/intern/moto/include' - ]) - -phy_sumo_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE']) +incs =['.', + '../common', + 'Fuzzics/include', + '#/intern/moto/include' + ] +incs += [sumoenv['BF_SOLID_INC']] -if sys.platform=='win32': - phy_sumo_env.Append (CXXFLAGS = ['/GR']) - phy_sumo_env.Append ( CCFLAGS =['/O1']) +if sumoenv['PLATFORM']=='win32': + sumoenv.Append (CXXFLAGS = ['/GR']) + sumoenv.Append ( CCFLAGS =['/O1']) -phy_sumo_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Sumo', source=source_files) +#env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Sumo', source=source_files) +env.BlenderLib ( 'PHY_Sumo', sources, incs, [], libtype='game2', priority=30 ) diff --git a/source/gameengine/Physics/common/SConscript b/source/gameengine/Physics/common/SConscript index fbde29861e6..b6cb78742ab 100755 --- a/source/gameengine/Physics/common/SConscript +++ b/source/gameengine/Physics/common/SConscript @@ -1,16 +1,8 @@ #!/usr/bin/python -Import ('user_options_dict') -Import ('library_env') +Import ('env') -phy_physics_env = library_env.Copy () +sources = 'PHY_IMotionState.cpp PHY_IPhysicsController.cpp PHY_IPhysicsEnvironment.cpp' -source_files = ['PHY_IMotionState.cpp', - 'PHY_IPhysicsController.cpp', - 'PHY_IPhysicsEnvironment.cpp'] +incs = '. ../Dummy #intern/moto/include' -phy_physics_env.Append (CPPPATH = ['.', - '../Dummy', - '#intern/moto/include' - ]) - -phy_physics_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Physics', source=source_files) +env.BlenderLib ( 'PHY_Physics', Split(sources), Split(incs), [], libtype=['game', 'game2'], priority=[20, 35] ) |