SCons updates

* Almost all library settings are now available in the config.opts user option
  file.
* All platform variables had to be updated to make this possible. Things are
  much clearer now, but I only was able to test the changes on Linux. I've
  tried to update all other platform variables, but things are most likely to
  be broken. Please contact me how to resolve the issues.


Note: Before running scons, remove your existing config.opts file to get all
      new options.

10 files changed, 29 insertions, 34 deletions

diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript
index d3172a3515f..9b091fc7c7f 100644
--- a/source/blender/blenlib/SConscript
+++ b/source/blender/blenlib/SConscript
@@ -39,4 +39,5 @@ blenlib_env.Append (CPPPATH = ['.',
                                '../include'])
 
 blenlib_env.Append (CPPPATH = extra_includes)
+blenlib_env.Prepend (CPPPATH = user_options_dict['FREETYPE_INCLUDE'])
 blenlib_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blenlib', source=source_files)
diff --git a/source/blender/ftfont/SConscript b/source/blender/ftfont/SConscript
index f44b765ec76..abd5933e815 100644
--- a/source/blender/ftfont/SConscript
+++ b/source/blender/ftfont/SConscript
@@ -16,6 +16,7 @@ include_paths = ['.',
 ftf_env = Environment()
 ftf_env.Append(CPPPATH = extra_includes)
 ftf_env.Append(CPPPATH = include_paths)
+ftf_env.Prepend (CPPPATH = user_options_dict['FREETYPE_INCLUDE'])
 ftf_env.Append(CCFLAGS = cflags)
 ftf_env.Append(CXXFLAGS = cxxflags)
 ftf_env.Append(CPPDEFINES = defines)
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript
index 66b359bc61e..5f1cbbb8767 100644
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -4,7 +4,6 @@ python_env = Environment ()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
-Import ('python_include')
 Import ('extra_includes')
 Import ('user_options_dict')
 python_env.Append (CCFLAGS = cflags)
@@ -57,8 +56,8 @@ python_env.Append (CPPPATH = ['api2_2x',
                               '#/intern/guardedalloc',
                               '#/intern/bmfont',
                               '../imbuf',
-                              '../include',
-                              python_include])
+                              '../include'])
 
+python_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
 python_env.Append (CPPPATH = extra_includes)
 python_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_python', source=source_files)
diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript
index c718ad1c90f..68ed7ef0077 100644
--- a/source/blender/src/SConscript
+++ b/source/blender/src/SConscript
@@ -4,13 +4,10 @@ src_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
-Import ('python_include')
-Import ('sdl_cflags')
-Import ('sdl_include')
 Import ('extra_includes')
 Import ('user_options_dict')
 src_env.Append (CCFLAGS = cflags)
-src_env.Append (CCFLAGS = sdl_cflags)
+src_env.Append (CCFLAGS = user_options_dict['SDL_CFLAGS'])
 src_env.Append (CXXFLAGS = cxxflags)
 src_env.Append (CPPDEFINES = defines)
 
@@ -136,9 +133,10 @@ src_env.Append (CPPPATH = ['#/intern/guardedalloc',
                            '../readstreamglue',
                            '../img',
                            '../quicktime',
-                           '#/intern/ghost',
-                           python_include,
-                           sdl_include])
+                           '#/intern/ghost'])
+
+src_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
+src_env.Append (CPPPATH = user_options_dict['SDL_INCLUDE'])
 
 if user_options_dict['USE_INTERNATIONAL'] == 1:
     src_env.Append (CPPPATH=['../ftfont'])
diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript
index 0e39cf02107..bd6e42d1622 100755
--- a/source/gameengine/BlenderRoutines/SConscript
+++ b/source/gameengine/BlenderRoutines/SConscript
@@ -4,8 +4,6 @@ kx_blenderhook_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
-Import ('python_include')
-Import ('solid_include')
 Import ('user_options_dict')
 kx_blenderhook_env.Append (CCFLAGS = cflags)
 kx_blenderhook_env.Append (CXXFLAGS = cxxflags)
@@ -26,7 +24,6 @@ kx_blenderhook_env.Append (CPPPATH=['.',
                                     '#intern/string',
                                     '#intern/guardedalloc',
                                     '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
-                                    python_include,
                                     '#intern/bmfont',
                                     '#source/gameengine/Converter',
                                     '#source/blender/imbuf',
@@ -47,8 +44,10 @@ kx_blenderhook_env.Append (CPPPATH=['.',
                                     '#source/gameengine/Network/LoopBackNetwork',
                                     '#intern/SoundSystem',
                                     '#source/blender/misc',
-                                    '#source/blender/blenloader',
-                                    solid_include,
+                                    '#source/blender/blenloader'
                                     ])
 
+kx_blenderhook_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
+kx_blenderhook_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE'])
+
 kx_blenderhook_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_blenderhook', source=source_files)
diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript
index 795274ca345..81968e1f864 100755
--- a/source/gameengine/Converter/SConscript
+++ b/source/gameengine/Converter/SConscript
@@ -4,8 +4,6 @@ kx_converter_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
-Import ('solid_include')
-Import ('python_include')
 Import ('user_options_dict')
 kx_converter_env.Append (CCFLAGS = cflags)
 kx_converter_env.Append (CXXFLAGS = cxxflags)
@@ -33,7 +31,6 @@ kx_converter_env.Append (CPPPATH = ['.',
                                     '#intern/string',
                                     '#intern/guardedalloc',
                                     '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
-                                    python_include,
                                     '#intern/bmfont',
                                     '#intern/SoundSystem',
                                     '#intern/SoundSystem/include',
@@ -63,8 +60,10 @@ kx_converter_env.Append (CPPPATH = ['.',
                                     '#source/gameengine/Physics/Sumo/Fuzzics/include',
                                     '#source/gameengine/Network/LoopBackNetwork',
                                     '#source/blender/misc',
-                                    '#source/blender/blenloader',
-                                    solid_include
+                                    '#source/blender/blenloader'
                                     ])
 
+kx_converter_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
+kx_converter_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE'])
+
 kx_converter_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_converter', source=source_files)
diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript
index 5a5205bd3bc..4ee0e322cc5 100755
--- a/source/gameengine/Expressions/SConscript
+++ b/source/gameengine/Expressions/SConscript
@@ -4,7 +4,6 @@ expressions_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
-Import ('python_include')
 Import ('user_options_dict')
 expressions_env.Append (CCFLAGS = cflags)
 expressions_env.Append (CXXFLAGS = cxxflags)
@@ -32,7 +31,8 @@ source_files = ['BoolValue.cpp',
 
 expressions_env.Append (CPPPATH = ['.',
                                    '#source/kernel/gen_system',
-                                   '#intern/string',
-                                   python_include])
+                                   '#intern/string'])
+
+expressions_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
 
 expressions_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_expressions', source=source_files)
diff --git a/source/gameengine/GameLogic/SConscript b/source/gameengine/GameLogic/SConscript
index 33de774b314..5659b510552 100755
--- a/source/gameengine/GameLogic/SConscript
+++ b/source/gameengine/GameLogic/SConscript
@@ -4,7 +4,6 @@ sca_gamelogic_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
-Import ('python_include')
 Import ('user_options_dict')
 sca_gamelogic_env.Append (CCFLAGS = cflags)
 sca_gamelogic_env.Append (CXXFLAGS = cxxflags)
@@ -42,8 +41,8 @@ sca_gamelogic_env.Append (CPPPATH=['.',
                                    '#/source/kernel/gen_system',
                                    '#/intern/string',
                                    '#/source/gameengine/Expressions',
-                                   '#/intern/moto/include',
-                                   python_include,
-                                  ])
+                                   '#/intern/moto/include'])
+
+sca_gamelogic_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
 
 sca_gamelogic_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/SCA_GameLogic', source=source_files)
diff --git a/source/gameengine/Ketsji/KXNetwork/SConscript b/source/gameengine/Ketsji/KXNetwork/SConscript
index 43dc4998c36..2f4be26cdf5 100755
--- a/source/gameengine/Ketsji/KXNetwork/SConscript
+++ b/source/gameengine/Ketsji/KXNetwork/SConscript
@@ -4,7 +4,6 @@ kx_network_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
-Import ('python_include')
 Import ('user_options_dict')
 kx_network_env.Append (CCFLAGS = cflags)
 kx_network_env.Append (CXXFLAGS = cxxflags)
@@ -20,11 +19,12 @@ source_files = ['KX_NetworkEventManager.cpp',
 kx_network_env.Append (CPPPATH = ['.',
                                   '#source/kernel/gen_system',
                                   '#intern/string',
-                                  python_include,
                                   '#source/gameengine/Ketsji',
                                   '#source/gameengine/GameLogic',
                                   '#source/gameengine/Expressions',
                                   '#source/gameengine/Network',
                                  ])
 
+kx_network_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
+
 kx_network_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_network', source=source_files)
diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript
index f035f5f4b9e..489d112ba5e 100644
--- a/source/gameengine/Ketsji/SConscript
+++ b/source/gameengine/Ketsji/SConscript
@@ -4,8 +4,6 @@ ketsji_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
-Import ('python_include')
-Import ('solid_include')
 Import ('user_options_dict')
 ketsji_env.Append (CCFLAGS = cflags)
 ketsji_env.Append (CXXFLAGS = cxxflags)
@@ -63,7 +61,7 @@ source_files = ['KX_WorldIpoController.cpp',
 
 if user_options_dict['USE_PHYSICS'] == 'solid':
     source_files += ['KX_SumoPhysicsController.cpp']
-    ketsji_env.Append (CPPPATH = [solid_include])
+    ketsji_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE'])
 
 if user_options_dict['USE_PHYSICS'] == 'ode':
     source_files += ['KX_OdePhysicsController.cpp']
@@ -103,8 +101,9 @@ ketsji_env.Append (CPPPATH = ['.',
                               '#source/gameengine/Physics/Sumo/Fuzzics/include',
                               '#source/gameengine/Network/LoopBackNetwork',
                               '#source/blender/misc',
-                              '#source/blender/blenloader',
-                              python_include
+                              '#source/blender/blenloader'
                              ])
 
+ketsji_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
+
 ketsji_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_ketsji', source=source_files)