- [win32] updated SConscripts to use new configuration method (config.opts).

  NOTE: ODE support needs still to be reviewed, so disable gameengine for now.

9 files changed, 12 insertions, 2 deletions

diff --git a/source/blender/avi/SConscript b/source/blender/avi/SConscript
index 8548178606c..752b647bc88 100644
--- a/source/blender/avi/SConscript
+++ b/source/blender/avi/SConscript
@@ -21,5 +21,6 @@ source_files = ['intern/avi.c',
 avi_env.Append (CPPPATH = ['.',
                            '#/intern/guardedalloc'])
 
+avi_env.Append (CPPPATH=user_options_dict['JPEG_INCLUDE'])
 avi_env.Append (CPPPATH=extra_includes)
 avi_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_avi', source=source_files)
diff --git a/source/blender/deflate/SConscript b/source/blender/deflate/SConscript
index 190e4ed416b..06604f846ff 100644
--- a/source/blender/deflate/SConscript
+++ b/source/blender/deflate/SConscript
@@ -18,5 +18,6 @@ deflate_env.Append (CPPPATH = ['.',
                                '../readstreamglue',
                                '../inflate'])
 
+deflate_env.Append (CPPPATH=user_options_dict['Z_INCLUDE'])
 deflate_env.Append (CPPPATH=extra_includes)
 deflate_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_deflate', source=source_files)
diff --git a/source/blender/ftfont/SConscript b/source/blender/ftfont/SConscript
index abd5933e815..3cde8d6346b 100644
--- a/source/blender/ftfont/SConscript
+++ b/source/blender/ftfont/SConscript
@@ -16,7 +16,9 @@ include_paths = ['.',
 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)
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index d67b80c5b8a..d3387380ecc 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -46,5 +46,8 @@ imbuf_env.Append (CPPPATH = ['.',
                              '../quicktime',
                              '../blenkernel'])
 
+imbuf_env.Append (CPPPATH = user_options_dict['JPEG_INCLUDE'])
+imbuf_env.Append (CPPPATH = user_options_dict['PNG_INCLUDE'])
+imbuf_env.Append (CPPPATH = user_options_dict['Z_INCLUDE'])
 imbuf_env.Append (CPPPATH = extra_includes)
 imbuf_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_imbuf', source=source_files)
diff --git a/source/blender/inflate/SConscript b/source/blender/inflate/SConscript
index 65bb8586799..cca725d13e7 100644
--- a/source/blender/inflate/SConscript
+++ b/source/blender/inflate/SConscript
@@ -17,5 +17,6 @@ inflate_env.Append (CPPPATH = ['.',
                                '../../kernel/gen_messaging',
                                '../readstreamglue'])
 
+inflate_env.Append (CPPPATH = user_options_dict['Z_INCLUDE'])
 inflate_env.Append (CPPPATH = extra_includes)
 inflate_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_inflate', source=source_files)
diff --git a/source/blender/readstreamglue/SConscript b/source/blender/readstreamglue/SConscript
index 3c96bcca9b0..a77806da21e 100644
--- a/source/blender/readstreamglue/SConscript
+++ b/source/blender/readstreamglue/SConscript
@@ -18,5 +18,6 @@ readstrgl_env.Append (CPPPATH = ['.',
                                  '../blenloader',
                                  '../inflate'])
 
+readstrgl_env.Append (CPPPATH = user_options_dict['Z_INCLUDE'])
 readstrgl_env.Append (CPPPATH = extra_includes)
 readstrgl_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_readstreamglue', source=source_files)
diff --git a/source/blender/writeblenfile/SConscript b/source/blender/writeblenfile/SConscript
index 48a1cba4949..6a30c7df3aa 100644
--- a/source/blender/writeblenfile/SConscript
+++ b/source/blender/writeblenfile/SConscript
@@ -19,5 +19,6 @@ wrblenfile_env.Append (CPPPATH = ['.',
                                   '../readstreamglue',
                                   '../readblenfile'])
 
+wrblenfile_env.Append (CPPPATH = user_options_dict['Z_INCLUDE'])
 wrblenfile_env.Append (CPPPATH = extra_includes)
 wrblenfile_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_writeblenfile', source=source_files)
diff --git a/source/blender/writestreamglue/SConscript b/source/blender/writestreamglue/SConscript
index aa2d4d10e2e..0973f2714e0 100644
--- a/source/blender/writestreamglue/SConscript
+++ b/source/blender/writestreamglue/SConscript
@@ -20,6 +20,7 @@ wrstrgl_env.Append (CPPPATH = ['.',
                                '../deflate',
                                '../writeblenfile',
                                '../../kernel/gen_messaging'])
+wrstrgl_env.Append (CPPPATH = user_options_dict['Z_INCLUDE'])
 
 wrstrgl_env.Append (CPPPATH = extra_includes)
 wrstrgl_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_writestreamglue', source=source_files)
diff --git a/source/gameengine/Physics/BlOde/SConscript b/source/gameengine/Physics/BlOde/SConscript
index 0d5804cf5ac..5048d163731 100755
--- a/source/gameengine/Physics/BlOde/SConscript
+++ b/source/gameengine/Physics/BlOde/SConscript
@@ -4,7 +4,6 @@ phy_ode_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
-Import ('ode_include')
 Import ('user_options_dict')
 phy_ode_env.Append (CCFLAGS = cflags)
 phy_ode_env.Append (CXXFLAGS = cxxflags)
@@ -15,7 +14,7 @@ source_files = ['OdePhysicsController.cpp',
 
 phy_ode_env.Append (CPPPATH=['.',
                              '../common',
-                             ode_include
                             ])
+phy_ode_env.Append (CPPPATH=['ODE_INCLUDE'])
 
 phy_ode_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Ode', source=source_files)