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.

11 files changed, 32 insertions, 100 deletions

diff --git a/intern/SoundSystem/SConscript b/intern/SoundSystem/SConscript
index 89a0716dc85..6da9be3dd9a 100644
--- a/intern/SoundSystem/SConscript
+++ b/intern/SoundSystem/SConscript
@@ -1,17 +1,10 @@
-# TODO: Add the options for building with fmod and/or OpenAL
 import sys
 
-soundsys_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
 Import ('extra_includes')
+Import ('library_env')
 
-soundsys_env.Append (CCFLAGS = cflags)
-soundsys_env.Append (CXXFLAGS = cxxflags)
+soundsys_env = library_env.Copy ()
 
 source_files = ['dummy/SND_DummyDevice.cpp',
                 'intern/SND_AudioDevice.cpp',
@@ -39,7 +32,6 @@ if user_options_dict['USE_OPENAL'] == 1:
     soundsys_env.Append (CPPPATH=user_options_dict['OPENAL_INCLUDE'])
     if sys.platform=='win32':
         defines += ['_LIB']
-        soundsys_env.Append(CPPDEFINES = defines)
         
 if user_options_dict['USE_FMOD'] == 1:
     source_files += ['fmod/SND_FmodDevice.cpp']
diff --git a/intern/bmfont/SConscript b/intern/bmfont/SConscript
index 5779fd25cbb..c5207760c5a 100644
--- a/intern/bmfont/SConscript
+++ b/intern/bmfont/SConscript
@@ -1,13 +1,7 @@
-bmfont_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-bmfont_env.Append (CCFLAGS = cflags)
-bmfont_env.Append (CXXFLAGS = cxxflags)
-bmfont_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+bmfont_env = library_env.Copy ()
 
 source_files = ['intern/BMF_Api.cpp',
                 'intern/BMF_BitmapFont.cpp',
diff --git a/intern/bsp/SConscript b/intern/bsp/SConscript
index 975c9c9ba7d..dd21285cd0e 100644
--- a/intern/bsp/SConscript
+++ b/intern/bsp/SConscript
@@ -1,13 +1,7 @@
-bsp_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-bsp_env.Append (CCFLAGS = cflags)
-bsp_env.Append (CXXFLAGS = cxxflags)
-bsp_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+bsp_env = library_env.Copy ()
 
 source_files = ['intern/BSP_CSGHelper.cpp',
                 'intern/BSP_CSGMesh.cpp',
diff --git a/intern/container/SConscript b/intern/container/SConscript
index 6e03cc9d900..e7b8e09b811 100644
--- a/intern/container/SConscript
+++ b/intern/container/SConscript
@@ -1,13 +1,7 @@
-cont_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-cont_env.Append (CCFLAGS = cflags)
-cont_env.Append (CXXFLAGS = cxxflags)
-cont_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+cont_env = library_env.Copy ()
 
 source_files = ['intern/CTR_List.cpp']
 
diff --git a/intern/decimation/SConscript b/intern/decimation/SConscript
index 8bb7b9873f8..b4b8fa0e840 100644
--- a/intern/decimation/SConscript
+++ b/intern/decimation/SConscript
@@ -1,13 +1,7 @@
-dec_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-dec_env.Append (CCFLAGS = cflags)
-dec_env.Append (CXXFLAGS = cxxflags)
-dec_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+dec_env = library_env.Copy ()
 
 source_files = ['intern/LOD_EdgeCollapser.cpp',
                 'intern/LOD_ExternNormalEditor.cpp',
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript
index 7dbcb2703c6..6b58f056d9c 100644
--- a/intern/ghost/SConscript
+++ b/intern/ghost/SConscript
@@ -1,14 +1,8 @@
-ghost_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
+Import ('library_env')
 Import ('window_system')
-ghost_env.Append (CCFLAGS = cflags)
-ghost_env.Append (CXXFLAGS = cxxflags)
-ghost_env.Append (CPPDEFINES = defines)
+
+ghost_env = library_env.Copy ()
 
 source_files = ['intern/GHOST_Buttons.cpp',
                 'intern/GHOST_C-api.cpp',
diff --git a/intern/guardedalloc/SConscript b/intern/guardedalloc/SConscript
index 21e2c8f66b0..8fdcafb573d 100644
--- a/intern/guardedalloc/SConscript
+++ b/intern/guardedalloc/SConscript
@@ -1,13 +1,7 @@
-guardal_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-guardal_env.Append (CCFLAGS = cflags)
-guardal_env.Append (CXXFLAGS = cxxflags)
-guardal_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+guardal_env = library_env.Copy ()
 
 source_files = ['intern/mallocn.c']
 
diff --git a/intern/iksolver/SConscript b/intern/iksolver/SConscript
index 0121024110e..7a8b60b3c0e 100644
--- a/intern/iksolver/SConscript
+++ b/intern/iksolver/SConscript
@@ -1,13 +1,7 @@
-iksolver_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-iksolver_env.Append (CCFLAGS = cflags)
-iksolver_env.Append (CXXFLAGS = cxxflags)
-iksolver_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+iksolver_env = library_env.Copy ()
 
 source_files = ['intern/IK_QChain.cpp',
                 'intern/IK_QJacobianSolver.cpp',
diff --git a/intern/memutil/SConscript b/intern/memutil/SConscript
index 6bc45f62088..bac0672230c 100644
--- a/intern/memutil/SConscript
+++ b/intern/memutil/SConscript
@@ -1,13 +1,7 @@
-memutil_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-memutil_env.Append (CCFLAGS = cflags)
-memutil_env.Append (CXXFLAGS = cxxflags)
-memutil_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+memutil_env = library_env.Copy ()
 
 source_files = ['intern/MEM_RefCountedC-Api.cpp']
 
diff --git a/intern/moto/SConscript b/intern/moto/SConscript
index cc74c942716..502dd096a30 100644
--- a/intern/moto/SConscript
+++ b/intern/moto/SConscript
@@ -1,13 +1,7 @@
-moto_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-moto_env.Append (CCFLAGS = cflags)
-moto_env.Append (CXXFLAGS = cxxflags)
-moto_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+moto_env = library_env.Copy ()
 
 source_files = ['intern/MT_CmMatrix4x4.cpp',
                 'intern/MT_Matrix3x3.cpp',
diff --git a/intern/string/SConscript b/intern/string/SConscript
index 14304ec73cd..8cceecc5f9f 100644
--- a/intern/string/SConscript
+++ b/intern/string/SConscript
@@ -1,13 +1,7 @@
-string_env = Environment ()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
 Import ('user_options_dict')
-string_env.Append (CCFLAGS = cflags)
-string_env.Append (CXXFLAGS = cxxflags)
-string_env.Append (CPPDEFINES = defines)
+Import ('library_env')
+
+string_env = library_env.Copy ()
 
 source_files = ['intern/STR_String.cpp']