== SCons ==

* This commit is all of the rewrite work done on the SCons system. For
  documentation see doc/blender-scons.txt and doc/blender-scons-dev.txt.
  Also http://mediawiki.blender.org/index.php/BlenderDev/SconsRefactoring
  contains valuable information, along with what still needs to be done.

    - linux, os x and windows compile now.
    - files are compiled to BF_INSTALLDIR (see config/(platform)-config.py)
        - NOTE: Jean-Luc P will commit sometime during the weekend proper
          appit() for OS X. For now, copy the resulting binary to an
          existing .app bundle.
    - features:
        - cleaner structure for better maintenance
        - cleaner output during compile
        - better handling of build options
        - general overall speed increase
        - see the wiki for more info

  Cygwin, FreeBSD and Solaris systems still need work. For these systems:
    1) copy a config/(platform)-config.py to ie. config/cygwin-config.py
    2) set the proper defaults for your platform
    3) mail me at jesterking at letwory dot net with you configuration. if
       you need any modifications to the system, do send a patch, too.

  I'll be giving first-aid today and tomorrow, after that it'll be all
  regular development work :)

  /Nathan

1 files changed, 14 insertions, 17 deletions

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 )