SCons updates

* Blender static now links. By default this option is disabled on all
  platforms. Simply set the option in config.opts to 'true'.
* Added the following flags to config.opts:
  - HOST_CC.    This is the C compiler for the host platform. This value is the
                same as TARGET_CC when not cross compiling.
  - HOST_CXX.   This is the C++ compiler for the host platform. This value is
                the same as TARGET_CXX when not cross compiling.
  - TARGET_CC.  This is the C compiler for the target platform.
  - TARGET_CXX. This is the C++ compiler for the target platform.
  - TARGET_AR.  This is the linker command for linking libraries.
  - PATH        This is the standard search path
  All SConscript files have been updated to reflect these changes. Now it's
  possible to change only the root SConstruct file, and all compiler specific
  variables are passed automatically to all SConscript files. Of course, this
  does not apply to makesdna because there the host and target platform is
  different from all other libraries.
  To pass a variable that applies to all platforms, all we now have to do is
  set the correct value in library_env


Note: as usual, to get the latest options in the config.opts file, first
      remove your version.

23 files changed, 72 insertions, 202 deletions

diff --git a/source/blender/avi/SConscript b/source/blender/avi/SConscript
index 752b647bc88..0b5fce4f2d0 100644
--- a/source/blender/avi/SConscript
+++ b/source/blender/avi/SConscript
@@ -1,14 +1,8 @@
-avi_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('extra_includes')
 Import ('user_options_dict')
-avi_env.Append (CCFLAGS = cflags)
-avi_env.Append (CXXFLAGS = cxxflags)
-avi_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+avi_env = library_env.Copy ()
 
 source_files = ['intern/avi.c',
                 'intern/avirgb.c',
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 479980673d2..35fb11d79bd 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -1,13 +1,7 @@
-blenkernel_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-blenkernel_env.Append (CCFLAGS = cflags)
-blenkernel_env.Append (CXXFLAGS = cxxflags)
-blenkernel_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+blenkernel_env = library_env.Copy ()
 
 source_files = ['intern/constraint.c',
                 'intern/group.c',
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript
index bc36cd234e6..f26d7e87031 100644
--- a/source/blender/blenlib/SConscript
+++ b/source/blender/blenlib/SConscript
@@ -1,14 +1,8 @@
-blenlib_env = Environment ()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('extra_includes')
 Import ('user_options_dict')
-blenlib_env.Append (CCFLAGS = cflags)
-blenlib_env.Append (CXXFLAGS = cxxflags)
-blenlib_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+blenlib_env = library_env.Copy ()
 
 source_files = ['intern/BLI_dynstr.c',
                 'intern/BLI_ghash.c',
diff --git a/source/blender/blenloader/SConscript b/source/blender/blenloader/SConscript
index fdaa06afa62..26796a8eb38 100644
--- a/source/blender/blenloader/SConscript
+++ b/source/blender/blenloader/SConscript
@@ -1,13 +1,7 @@
-blenloader_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-blenloader_env.Append (CCFLAGS = cflags)
-blenloader_env.Append (CXXFLAGS = cxxflags)
-blenloader_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+blenloader_env = library_env.Copy ()
 
 source_files = ['intern/genfile.c',
                 'intern/readblenentry.c',
diff --git a/source/blender/blenpluginapi/SConscript b/source/blender/blenpluginapi/SConscript
index 91854db6816..2077f7ad2b6 100644
--- a/source/blender/blenpluginapi/SConscript
+++ b/source/blender/blenpluginapi/SConscript
@@ -1,13 +1,7 @@
-blenplugin_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-blenplugin_env.Append (CCFLAGS = cflags)
-blenplugin_env.Append (CXXFLAGS = cxxflags)
-blenplugin_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+blenplugin_env = library_env.Copy ()
 
 source_files = ['intern/pluginapi.c']
 
diff --git a/source/blender/deflate/SConscript b/source/blender/deflate/SConscript
index 06604f846ff..400c290f4e4 100644
--- a/source/blender/deflate/SConscript
+++ b/source/blender/deflate/SConscript
@@ -1,14 +1,8 @@
-deflate_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('extra_includes')
 Import ('user_options_dict')
-deflate_env.Append (CCFLAGS = cflags)
-deflate_env.Append (CXXFLAGS = cxxflags)
-deflate_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+deflate_env = library_env.Copy ()
 
 source_files = ['intern/BLO_deflate.c']
 
diff --git a/source/blender/ftfont/SConscript b/source/blender/ftfont/SConscript
index 8cfe4223f1b..bb73cc2cd73 100644
--- a/source/blender/ftfont/SConscript
+++ b/source/blender/ftfont/SConscript
@@ -1,9 +1,8 @@
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
 Import ('extra_includes')
-Import ('defines')
 Import ('user_options_dict')
+Import ('library_env')
+
+ftf_env = library_env.Copy ()
 
 source_files = ['intern/FTF_Api.cpp',
                 'intern/FTF_TTFont.cpp']
@@ -13,14 +12,10 @@ include_paths = ['.',
                  '../blenlib',
                  '../makesdna']
                  
-ftf_env = Environment()
 ftf_env.Append(CPPPATH = extra_includes)
 ftf_env.Append(CPPPATH = include_paths)
 ftf_env.Prepend (CPPPATH = user_options_dict['FTGL_INCLUDE'])
 ftf_env.Prepend (CPPPATH = user_options_dict['FREETYPE_INCLUDE'])
 ftf_env.Prepend (CPPPATH = user_options_dict['GETTEXT_INCLUDE'])
-ftf_env.Append(CCFLAGS = cflags)
-ftf_env.Append(CXXFLAGS = cxxflags)
-ftf_env.Append(CPPDEFINES = defines)
 ftf_env.Append(CPPDEFINES = 'FTGL_STATIC_LIBRARY')
 ftf_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_FTF', source=source_files)
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index d3387380ecc..60910aa0ee4 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -1,14 +1,8 @@
-imbuf_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('extra_includes')
 Import ('user_options_dict')
-imbuf_env.Append (CCFLAGS = cflags)
-imbuf_env.Append (CXXFLAGS = cxxflags)
-imbuf_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+imbuf_env = library_env.Copy ()
 
 source_files = ['intern/allocimbuf.c',
                 'intern/amiga.c',
diff --git a/source/blender/img/SConscript b/source/blender/img/SConscript
index 99f8d84e97c..2ea4101e66c 100644
--- a/source/blender/img/SConscript
+++ b/source/blender/img/SConscript
@@ -1,13 +1,7 @@
-img_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-img_env.Append (CCFLAGS = cflags)
-img_env.Append (CXXFLAGS = cxxflags)
-img_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+img_env = library_env.Copy ()
 
 source_files = ['intern/IMG_Api.cpp',
                 'intern/IMG_BrushRGBA32.cpp',
diff --git a/source/blender/inflate/SConscript b/source/blender/inflate/SConscript
index cca725d13e7..54d2ae487d4 100644
--- a/source/blender/inflate/SConscript
+++ b/source/blender/inflate/SConscript
@@ -1,15 +1,8 @@
-inflate_env = Environment ()
-# TODO: add the option to build with Quicktime
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('extra_includes')
 Import ('user_options_dict')
-inflate_env.Append (CCFLAGS = cflags)
-inflate_env.Append (CXXFLAGS = cxxflags)
-inflate_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+inflate_env = library_env.Copy ()
 
 source_files = ['intern/BLO_inflate.c']
 
diff --git a/source/blender/makesdna/SConscript b/source/blender/makesdna/SConscript
index a73336c1aed..793d36ff602 100644
--- a/source/blender/makesdna/SConscript
+++ b/source/blender/makesdna/SConscript
@@ -1,13 +1,7 @@
-makesdna_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-makesdna_env.Append (CCFLAGS = cflags)
-makesdna_env.Append (CXXFLAGS = cxxflags)
-makesdna_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+makesdna_env = library_env.Copy ()
 
 objs = []
 
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript
index 5924dcb7eb3..85f339bc5fa 100644
--- a/source/blender/makesdna/intern/SConscript
+++ b/source/blender/makesdna/intern/SConscript
@@ -1,7 +1,6 @@
 import sys
 # Import the C flags set in the SConstruct file
 Import ('cflags')
-Import ('cxxflags')
 Import ('defines')
 Import ('platform_libs')
 Import ('platform_libpath')
@@ -29,8 +28,10 @@ makesdna_tool = Environment (CCFLAGS='-DBASE_HEADER="\\"source/blender/makesdna/
 makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc',
                                  '..'])
 
+makesdna_tool.Replace (CC = user_options_dict['HOST_CC'])
+makesdna_tool.Replace (PATH = user_options_dict['PATH'])
+
 makesdna_tool.Append (CCFLAGS = cflags)
-makesdna_tool.Append (CXXFLAGS = cxxflags)
 makesdna_tool.Append (CPPDEFINES = defines)
 makesdna_tool.Append (LINKFLAGS = platform_linkflags)
 makesdna_tool.Append (LIBPATH = '#'+user_options_dict['BUILD_DIR']+'/lib')
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript
index d8780a409ad..21cc9d558e9 100644
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -1,14 +1,8 @@
-python_env = Environment ()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('extra_includes')
 Import ('user_options_dict')
-python_env.Append (CCFLAGS = cflags)
-python_env.Append (CXXFLAGS = cxxflags)
-python_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+python_env = library_env.Copy ()
 
 source_files = ['BPY_interface.c',
                 'BPY_menus.c',
@@ -45,8 +39,8 @@ source_files = ['BPY_interface.c',
                 'api2_2x/vector.c',
                 'api2_2x/constant.c',
                 'api2_2x/matrix.c',
-		    'api2_2x/euler.c',
-		    'api2_2x/quat.c',
+                'api2_2x/euler.c',
+                'api2_2x/quat.c',
                 'api2_2x/Mathutils.c',
                 'api2_2x/rgbTuple.c',
                 'api2_2x/gen_utils.c',
diff --git a/source/blender/quicktime/SConscript b/source/blender/quicktime/SConscript
index 07c22398fef..5a37d18b5ea 100644
--- a/source/blender/quicktime/SConscript
+++ b/source/blender/quicktime/SConscript
@@ -1,15 +1,10 @@
-quicktime_env = Environment ()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
 Import ('extra_includes')
-Import ('defines')
 Import ('user_options_dict')
-quicktime_env.Append (CCFLAGS = cflags)
-quicktime_env.Append (CXXFLAGS = cxxflags)
+Import ('library_env')
+
+quicktime_env = library_env.Copy ()
+
 quicktime_env.Append (CPPPATH = extra_includes)
-quicktime_env.Append (CPPDEFINES = defines)
 
 source_files = ['apple/quicktime_import.c',
                 'apple/quicktime_export.c']
diff --git a/source/blender/radiosity/SConscript b/source/blender/radiosity/SConscript
index 512d7dad0a4..2e7be6ae331 100644
--- a/source/blender/radiosity/SConscript
+++ b/source/blender/radiosity/SConscript
@@ -1,13 +1,7 @@
-rad_env = Environment ()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-rad_env.Append (CCFLAGS = cflags)
-rad_env.Append (CXXFLAGS = cxxflags)
-rad_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+rad_env = library_env.Copy ()
 
 source_files = ['intern/source/raddisplay.c',
                 'intern/source/radfactors.c',
diff --git a/source/blender/readblenfile/SConscript b/source/blender/readblenfile/SConscript
index 4452b21f718..69671732055 100644
--- a/source/blender/readblenfile/SConscript
+++ b/source/blender/readblenfile/SConscript
@@ -1,13 +1,7 @@
-readblenfile_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-readblenfile_env.Append (CCFLAGS = cflags)
-readblenfile_env.Append (CXXFLAGS = cxxflags)
-readblenfile_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+readblenfile_env = library_env.Copy ()
 
 source_files = ['intern/BLO_readblenfile.c']
 
diff --git a/source/blender/readstreamglue/SConscript b/source/blender/readstreamglue/SConscript
index a77806da21e..2a7484a766a 100644
--- a/source/blender/readstreamglue/SConscript
+++ b/source/blender/readstreamglue/SConscript
@@ -1,14 +1,8 @@
-readstrgl_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('extra_includes')
 Import ('user_options_dict')
-readstrgl_env.Append (CCFLAGS = cflags)
-readstrgl_env.Append (CXXFLAGS = cxxflags)
-readstrgl_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+readstrgl_env = library_env.Copy ()
 
 source_files = ['intern/BLO_readStreamGlue.c',
                 'intern/BLO_readStreamGlueLoopBack.c']
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript
index ea9d30a7003..5bce095ceb7 100644
--- a/source/blender/render/SConscript
+++ b/source/blender/render/SConscript
@@ -1,13 +1,7 @@
-render_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-render_env.Append (CCFLAGS = cflags)
-render_env.Append (CXXFLAGS = cxxflags)
-render_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+render_env = library_env.Copy ()
 
 source_files = ['intern/source/RE_callbacks.c',
                 'intern/source/edgeRender.c',
diff --git a/source/blender/renderconverter/SConscript b/source/blender/renderconverter/SConscript
index 1cd12c181f9..5ab99c09b11 100644
--- a/source/blender/renderconverter/SConscript
+++ b/source/blender/renderconverter/SConscript
@@ -1,13 +1,7 @@
-renderconv_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-renderconv_env.Append (CCFLAGS = cflags)
-renderconv_env.Append (CXXFLAGS = cxxflags)
-renderconv_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+renderconv_env = library_env.Copy ()
 
 source_files = ['intern/convertBlenderScene.c']
 
diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript
index 4e434655059..c5586204b77 100644
--- a/source/blender/src/SConscript
+++ b/source/blender/src/SConscript
@@ -1,15 +1,9 @@
-src_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('extra_includes')
 Import ('user_options_dict')
-src_env.Append (CCFLAGS = cflags)
+Import ('library_env')
+
+src_env = library_env.Copy ()
 src_env.Append (CCFLAGS = user_options_dict['SDL_CFLAGS'])
-src_env.Append (CXXFLAGS = cxxflags)
-src_env.Append (CPPDEFINES = defines)
 
 source_files = ['B.blend.c',
                 'Bfont.c',
diff --git a/source/blender/writeblenfile/SConscript b/source/blender/writeblenfile/SConscript
index 6a30c7df3aa..8e7efdaacf3 100644
--- a/source/blender/writeblenfile/SConscript
+++ b/source/blender/writeblenfile/SConscript
@@ -1,14 +1,8 @@
-wrblenfile_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('extra_includes')
 Import ('user_options_dict')
-wrblenfile_env.Append (CCFLAGS = cflags)
-wrblenfile_env.Append (CXXFLAGS = cxxflags)
-wrblenfile_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+wrblenfile_env = library_env.Copy ()
 
 source_files = ['intern/BLO_writeblenfile.c']
 
diff --git a/source/blender/writestreamglue/SConscript b/source/blender/writestreamglue/SConscript
index 0973f2714e0..1a41ecee12c 100644
--- a/source/blender/writestreamglue/SConscript
+++ b/source/blender/writestreamglue/SConscript
@@ -1,14 +1,8 @@
-wrstrgl_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('extra_includes')
 Import ('user_options_dict')
-wrstrgl_env.Append (CCFLAGS = cflags)
-wrstrgl_env.Append (CXXFLAGS = cxxflags)
-wrstrgl_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+wrstrgl_env = library_env.Copy ()
 
 source_files = ['intern/BLO_dumpFromMemory.c',
                 'intern/BLO_getPubKey.c',
diff --git a/source/blender/yafray/SConscript b/source/blender/yafray/SConscript
index 88cc6ff44bc..ad0f4c62c29 100644
--- a/source/blender/yafray/SConscript
+++ b/source/blender/yafray/SConscript
@@ -1,13 +1,7 @@
-yafray_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-yafray_env.Append (CCFLAGS = cflags)
-yafray_env.Append (CXXFLAGS = cxxflags)
-yafray_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+yafray_env = library_env.Copy ()
 
 source_files = ['intern/yafray_Render.cpp',
                 'intern/export_File.cpp',