== 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, 25 insertions, 29 deletions

diff --git a/extern/qhull/SConscript b/extern/qhull/SConscript
index 927ca3a6a0d..2d767cfc58d 100644
--- a/extern/qhull/SConscript
+++ b/extern/qhull/SConscript
@@ -2,38 +2,34 @@
 import sys
 import os
 
-qhull_env = Environment(ENV = os.environ)
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('defines')
-Import ('user_options_dict')
+Import('env')
+defs = ''
+cflags = []
 if sys.platform=='linux2' or sys.platform=='linux-i386':
-	qhull_env.Append (CCFLAGS = ['-O2', '-ansi'])
-elif sys.platform=='win32':
-	qhull_env.Append (CCFLAGS = ['/O2'])
+   cflags += ['-O2','-ansi']
+elif env['OURPLATFORM']=='win32-vc':
+   cflags += ['/O2']
+elif env['OURPLATFORM']=='win32-mingw':
+   cflags += ['-O2']
 elif sys.platform=='sunos':
-	qhull_env.Append (CCFLAGS = ['Xc', '-v', '-fast'])
+   cflags += ['Xc', '-v', '-fast']
 elif sys.platform=='darwin':
-	qhull_env.Append (CCFLAGS = ['-O2', '-pipe', '-fPIC', '-funsigned-char', '-ffast-math', '-mpowerpc' , '-mtune=G4'])
-else:
-	qhull_env.Append (CCFLAGS = cflags)
-qhull_env.Append (CPPDEFINES = defines)
+   cflags += ['-O2', '-pipe', '-fPIC', '-funsigned-char', '-ffast-math', '-mpowerpc' , '-mtune=G4']
+
+sources = ['src/geom.c',
+    'src/geom2.c',
+    'src/global.c',
+    'src/io.c',
+    'src/mem.c',
+    'src/merge.c',
+    'src/poly.c',
+    'src/poly2.c',
+    'src/qhull.c',
+    'src/qset.c',
+    'src/stat.c',
+    'src/user.c']
 
-source_files = ['src/geom.c',
-                'src/geom2.c',
-                'src/global.c',
-                'src/io.c',
-                'src/mem.c',
-                'src/merge.c',
-                'src/poly.c',
-                'src/poly2.c',
-                'src/qhull.c',
-                'src/qset.c',
-                'src/stat.c',
-                'src/user.c']
 
-qhull_env.Append (CPPPATH = ['include',
-                             'src'])
+incs = 'include src'
 
-qhull_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/extern_qhull', source=source_files)
+env.BlenderLib ( 'extern_qhull', sources, Split(incs), Split(defs), libtype='game2', priority=50, compileflags = cflags)