== 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, 22 insertions, 54 deletions

diff --git a/intern/elbeem/SConscript b/intern/elbeem/SConscript
index 3ef20b9be3a..45050aff599 100644
--- a/intern/elbeem/SConscript
+++ b/intern/elbeem/SConscript
@@ -1,55 +1,23 @@
 #!/usr/bin/python
-Import ('library_env')
-Import('user_options_dict');
-Import('use_fluidsim');
-
-elbeem_env = library_env.Copy();
-elbeem_env.Append(CPPDEFINES= 'NOGUI');
-elbeem_env.Append(CPPDEFINES= [('ELBEEM_BLENDER',1)] );
-		
-if use_fluidsim=='false':
-	# print "El'Beem Fluid Simulation Disabled..." # debug
-	elbeem_env.Append (CPPPATH = user_options_dict['PNG_INCLUDE'])
-	# dummy interface build
-	Sources = [ 
-		"intern/utilities.cpp",
-		"intern/blenderdummy.cpp"
-			]; # sources
-else:
-	# print "Including El'Beem Fluid Simulation..." # debug
-	elbeem_env.Append (CPPPATH = user_options_dict['PNG_INCLUDE'])
-	elbeem_env.Append (CPPPATH = user_options_dict['Z_INCLUDE'])
-	elbeem_env.Append (CPPPATH = user_options_dict['SDL_INCLUDE'])
-
-	# main build----------------------------------------
-	Sources = [ 
-
-		"intern/cfgparser.cpp",
-		"intern/cfglexer.cpp",
-
-		"intern/attributes.cpp",
-		"intern/elbeem.cpp",
-		"intern/isosurface.cpp",
-		"intern/ntl_blenderdumper.cpp",
-		"intern/ntl_bsptree.cpp",
-		"intern/ntl_geometrymodel.cpp",
-		"intern/ntl_geometryobject.cpp",
-		"intern/ntl_lightobject.cpp",
-		"intern/ntl_ray.cpp",
-		"intern/ntl_scene.cpp",
-		"intern/ntl_world.cpp",
-		"intern/parametrizer.cpp",
-		"intern/particletracer.cpp",
-		"intern/simulation_object.cpp",
-		"intern/utilities.cpp",
-		"intern/blendercall.cpp",
-
-		"intern/solver_init.cpp",
-		"intern/solver_interface.cpp",
-		"intern/solver_main.cpp",
-		"intern/solver_util.cpp"
-
-		]; # sources
-
-elbeem_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_elbeem', source=Sources)
-
+import sys
+Import('env')
+ 
+#if use_fluidsim=='false':
+#   # print "El'Beem Fluid Simulation Disabled..." # debug
+#   elbeem_env.Append (CPPPATH = user_options_dict['PNG_INCLUDE'])
+#   elbeem_env.Append (CPPPATH = user_options_dict['SDL_INCLUDE'])
+#   elbeem_env.Append(CPPDEFINES= 'ELBEEM_DUMMIES');
+#   # dummy interface build
+#   Sources = [ 
+#       "intern/utilities.cpp",
+#       "intern/blenderdummy.cpp"
+#           ]; # sources
+
+sources = env.Glob('intern/*.cpp')
+
+defs = 'NOGUI ELBEEM_BLENDER=1'
+if sys.platform=='win32':
+    defs += ' USE_MSVC6FIXES'
+incs = env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] + ' ' +env['BF_SDL_INC']
+
+env.BlenderLib ('blender_elbeem', sources, Split(incs), Split(defs), libtype='blender', priority=0 )