4 files changed, 14 insertions, 38 deletions
diff --git a/source/gameengine/Physics/BlOde/SConscript b/source/gameengine/Physics/BlOde/SConscript
index 03be5c12b46..ff06d91423f 100755
--- a/source/gameengine/Physics/BlOde/SConscript
+++ b/source/gameengine/Physics/BlOde/SConscript
@@ -1,13 +1,7 @@
-phy_ode_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-phy_ode_env.Append (CCFLAGS = cflags)
-phy_ode_env.Append (CXXFLAGS = cxxflags)
-phy_ode_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+phy_ode_env = library_env.Copy ()
 
 source_files = ['OdePhysicsController.cpp',
                 'OdePhysicsEnvironment.cpp']
diff --git a/source/gameengine/Physics/Dummy/SConscript b/source/gameengine/Physics/Dummy/SConscript
index 7d634918b38..80a1e78dd1d 100755
--- a/source/gameengine/Physics/Dummy/SConscript
+++ b/source/gameengine/Physics/Dummy/SConscript
@@ -1,13 +1,7 @@
-phy_dummy_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-phy_dummy_env.Append (CCFLAGS = cflags)
-phy_dummy_env.Append (CXXFLAGS = cxxflags)
-phy_dummy_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+phy_dummy_env = library_env.Copy ()
 
 source_files = ['DummyPhysicsEnvironment.cpp']
 
diff --git a/source/gameengine/Physics/Sumo/SConscript b/source/gameengine/Physics/Sumo/SConscript
index 556b470f60e..c58e98ca4ce 100755
--- a/source/gameengine/Physics/Sumo/SConscript
+++ b/source/gameengine/Physics/Sumo/SConscript
@@ -1,14 +1,7 @@
-phy_sumo_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
-Import ('solid_include')
 Import ('user_options_dict')
-phy_sumo_env.Append (CCFLAGS = cflags)
-phy_sumo_env.Append (CXXFLAGS = cxxflags)
-phy_sumo_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+phy_sumo_env = library_env.Copy ()
 
 source_files = ['SumoPhysicsController.cpp',
                 'SumoPhysicsEnvironment.cpp',
@@ -19,8 +12,9 @@ source_files = ['SumoPhysicsController.cpp',
 phy_sumo_env.Append (CPPPATH = ['.',
                                 '../common',
                                 'Fuzzics/include',
-                                solid_include,
                                 '#/intern/moto/include'
                                ])
 
+phy_sumo_env.Append (CPPPATH = user_options_dict['solid_include'])
+
 phy_sumo_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Sumo', source=source_files)
diff --git a/source/gameengine/Physics/common/SConscript b/source/gameengine/Physics/common/SConscript
index 016f06b39d3..07a1cea766b 100755
--- a/source/gameengine/Physics/common/SConscript
+++ b/source/gameengine/Physics/common/SConscript
@@ -1,13 +1,7 @@
-phy_physics_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-phy_physics_env.Append (CCFLAGS = cflags)
-phy_physics_env.Append (CXXFLAGS = cxxflags)
-phy_physics_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+phy_physics_env = library_env.Copy ()
 
 source_files = ['PHY_IMotionState.cpp',
                 'PHY_IPhysicsController.cpp',