SCons updates
authorMichel Selten <michel@mselten.demon.nl>
Sun, 15 Feb 2004 19:25:32 +0000 (19:25 +0000)
committerMichel Selten <michel@mselten.demon.nl>
Sun, 15 Feb 2004 19:25:32 +0000 (19:25 +0000)
* libraries are now generated in [BUILD_DIR]/lib
* passed the user_options to all libraries now.
  This means I could remove a couple of Export/Import lines.
* Changed the order in source/blender/src/SConscript and
  source/gameengine/SConscript.
  All libraries are now sorted alphabetically. This has no impact on the build
  process.

54 files changed:
SConstruct
intern/SoundSystem/SConscript
intern/bmfont/SConscript
intern/bsp/SConscript
intern/container/SConscript
intern/decimation/SConscript
intern/ghost/SConscript
intern/guardedalloc/SConscript
intern/iksolver/SConscript
intern/memutil/SConscript
intern/moto/SConscript
intern/string/SConscript
source/SConscript
source/blender/SConscript
source/blender/avi/SConscript
source/blender/blenkernel/SConscript
source/blender/blenlib/SConscript
source/blender/blenloader/SConscript
source/blender/blenpluginapi/SConscript
source/blender/deflate/SConscript
source/blender/ftfont/SConscript
source/blender/imbuf/SConscript
source/blender/img/SConscript
source/blender/inflate/SConscript
source/blender/makesdna/SConscript
source/blender/makesdna/intern/SConscript
source/blender/python/SConscript
source/blender/quicktime/SConscript
source/blender/radiosity/SConscript
source/blender/readblenfile/SConscript
source/blender/readstreamglue/SConscript
source/blender/render/SConscript
source/blender/renderconverter/SConscript
source/blender/src/SConscript
source/blender/writeblenfile/SConscript
source/blender/writestreamglue/SConscript
source/blender/yafray/SConscript
source/gameengine/BlenderRoutines/SConscript
source/gameengine/Converter/SConscript
source/gameengine/Expressions/SConscript
source/gameengine/GameLogic/SConscript
source/gameengine/Ketsji/KXNetwork/SConscript
source/gameengine/Ketsji/SConscript
source/gameengine/Network/LoopBackNetwork/SConscript
source/gameengine/Network/SConscript
source/gameengine/Physics/BlOde/SConscript
source/gameengine/Physics/Dummy/SConscript
source/gameengine/Physics/Sumo/SConscript
source/gameengine/Physics/common/SConscript
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
source/gameengine/Rasterizer/SConscript
source/gameengine/SConscript
source/gameengine/SceneGraph/SConscript
source/kernel/SConscript

index bf96845bc3e9602ed6a13ad1b98f65b9f278b827..84ab8e58283f7355c6939d55cc75340a6eefc3b1 100644 (file)
@@ -368,69 +368,29 @@ user_options.AddOptions (
                      allowed_values = ('release', 'debug'))),
     )
 user_options.Update (user_options_env)
-user_dict = user_options_env.Dictionary()
+user_options_dict = user_options_env.Dictionary()
 
-root_build_dir = user_dict['BUILD_DIR']
-if user_dict['USE_INTERNATIONAL'] == 1:
-    use_international = 'true'
-else:
-    use_international = 'false'
+root_build_dir = user_options_dict['BUILD_DIR']
     
-if user_dict['USE_PHYSICS'] == 'ode':
-    use_ode = 'true'
-    use_sumo = 'false'
-else:
-    use_ode = 'false'
-    use_sumo = 'true'
-
-if user_dict['BUILD_GAMEENGINE']:
-    use_gameengine = 'true'
+if user_options_dict['BUILD_GAMEENGINE'] == 1:
     defines += ['GAMEBLENDER=1']
+    if user_options_dict['USE_PHYSICS'] == 'ode':
+        defines += ['USE_ODE']
+    else:
+        defines += ['USE_SUMO_SOLID']
 else:
-    use_gameengine = 'false'
     defines += ['GAMEBLENDER=0']
 
-if user_dict['USE_OPENAL'] == 1:
-    use_openal = 'true'
-else:
-    use_openal = 'false'
-
-if user_dict['USE_FMOD'] == 1:
-    use_fmod = 'true'
-else:
-    use_fmod = 'false'
-
-if user_dict['USE_QUICKTIME'] == 1:
-    use_quicktime = 'true'
-else:
-    use_quicktime = 'false'
-
-if user_dict['BUILD_BINARY'] == 'release':
+if user_options_dict['BUILD_BINARY'] == 'release':
     cflags = extra_flags + release_flags + warn_flags
 else:
     cflags = extra_flags + debug_flags + warn_flags
 
-#-----------------------------------------------------------------------------
-# Game Engine settings
-#-----------------------------------------------------------------------------
-if use_gameengine == 'true':
-    if use_sumo == 'true':
-        defines += ['USE_SUMO_SOLID']
-    if use_ode == 'true':
-        defines += ['USE_ODE']
-
 #-----------------------------------------------------------------------------
 # Settings to be exported to other SConscript files
 #-----------------------------------------------------------------------------
 cflags = extra_flags + release_flags + warn_flags
 
-Export ('use_international')
-Export ('use_gameengine')
-Export ('use_openal')
-Export ('use_fmod')
-Export ('use_quicktime')
-Export ('use_ode')
-Export ('use_sumo')
 Export ('python_include')
 Export ('cflags')
 Export ('defines')
@@ -445,13 +405,14 @@ Export ('platform_libs')
 Export ('platform_libpath')
 Export ('platform_linkflags')
 Export ('root_build_dir')
+Export ('user_options_dict')
 
 BuildDir (root_build_dir+'/intern', 'intern', duplicate=0)
 SConscript (root_build_dir+'intern/SConscript')
 BuildDir (root_build_dir+'/source', 'source', duplicate=0)
 SConscript (root_build_dir+'source/SConscript')
 
-libpath = (['lib'])
+libpath = (['#'+root_build_dir+'/lib'])
 
 libraries = (['blender_render',
               'blender_yafray',
index d6d872139622662ec9a145a8c195ef11985c7d62..16f4e4b8a3ad1f5af8db6d822623aa6e233178c3 100644 (file)
@@ -7,8 +7,7 @@ soundsys_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
-Import ('use_openal')
-Import ('use_fmod')
+Import ('user_options_dict')
 Import ('extra_includes')
 
 soundsys_env.Append (CCFLAGS = cflags)
@@ -34,20 +33,19 @@ soundsys_env.Append (CPPPATH = ['.',
                                 'dummy',
                                 'openal'])
 
-if use_openal == 'true':
+if user_options_dict['USE_OPENAL'] == 1:
     source_files += ['openal/SND_OpenALDevice.cpp',
                      'openal/pthread_cancel.cpp']
     if sys.platform=='win32':
         defines += ['_LIB']
         soundsys_env.Append(CPPDEFINES = defines)
         
-
-if use_fmod == 'true':
+if user_options_dict['USE_FMOD'] == 1:
     source_files += ['fmod/SND_FmodDevice.cpp']
 
-if use_openal == 'false' and use_fmod == 'false':
+if user_options_dict['USE_OPENAL'] == 0 and user_options_dict['USE_FMOD'] == 0:
     soundsys_env.Append (CPPDEFINES = 'NO_SOUND')
 
 soundsys_env.Append (CPPPATH = extra_includes)
 
-soundsys_env.Library (target='#/lib/soundsystem', source=source_files)
+soundsys_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/soundsystem', source=source_files)
index 3ba26e6b74c6d0dd0b98570ee4a482586a7d4634..5779fd25cbb6633d1ee4357f8d15d4eec03657ae 100644 (file)
@@ -4,6 +4,7 @@ bmfont_env = Environment()
 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)
@@ -23,4 +24,4 @@ source_files = ['intern/BMF_Api.cpp',
 bmfont_env.Append (CPPPATH = ['.',
                               'intern'])
 
-bmfont_env.Library (target='#/lib/blender_BMF', source=source_files)
+bmfont_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_BMF', source=source_files)
index d60bad299e299f27e0b416301318de120c63e4ff..975c9c9ba7d0c0fe1d9ce8d5778aa1099aa68e8a 100644 (file)
@@ -4,6 +4,7 @@ bsp_env = Environment()
 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)
@@ -26,4 +27,4 @@ bsp_env.Append (CPPPATH = ['intern',
                            '../moto/include',
                            '../memutil'])
 
-bsp_env.Library (target='#/lib/blender_BSP', source=source_files)
+bsp_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_BSP', source=source_files)
index d916e7e221c07c47a980720892203a7af074524e..6e03cc9d900a18e59701f948d85ae1b9be13c954 100644 (file)
@@ -4,6 +4,7 @@ cont_env = Environment()
 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)
@@ -12,4 +13,4 @@ source_files = ['intern/CTR_List.cpp']
 
 cont_env.Append (CPPPATH = ['.'])
 
-cont_env.Library (target='#/lib/blender_CTR', source=source_files)
+cont_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_CTR', source=source_files)
index 7846cc1667ffb645bdba1b775093884847da2521..8bb7b9873f8fc652d470f86c53ffe44767d58757 100644 (file)
@@ -4,6 +4,7 @@ dec_env = Environment()
 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)
@@ -23,4 +24,4 @@ dec_env.Append (CPPPATH = ['intern',
                            '../container',
                            '../memutil'])
 
-dec_env.Library (target='#/lib/blender_LOD', source=source_files)
+dec_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_LOD', source=source_files)
index 7a2b34dcf21bda056f0d841e2e844f1505d8763d..7dbcb2703c6316e0a4c3ce6ecad128132ba0d27a 100644 (file)
@@ -4,12 +4,12 @@ ghost_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
+Import ('window_system')
 ghost_env.Append (CCFLAGS = cflags)
 ghost_env.Append (CXXFLAGS = cxxflags)
 ghost_env.Append (CPPDEFINES = defines)
 
-Import ('window_system')
-
 source_files = ['intern/GHOST_Buttons.cpp',
                 'intern/GHOST_C-api.cpp',
                 'intern/GHOST_CallbackEventConsumer.cpp',
@@ -42,4 +42,4 @@ else:
 ghost_env.Append (CPPPATH = ['.',
                              '../string'])
 
-ghost_env.Library (target='#/lib/blender_GHOST', source=source_files)
+ghost_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_GHOST', source=source_files)
index 23e4faa75feeaa53939243f196de0dcff6dd18a2..21e2c8f66b07a060e67b6c1e92d65086ab315158 100644 (file)
@@ -4,6 +4,7 @@ guardal_env = Environment()
 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)
@@ -12,4 +13,4 @@ source_files = ['intern/mallocn.c']
 
 guardal_env.Append (CPPPATH = ['.'])
 
-guardal_env.Library (target='#/lib/blender_guardedalloc', source=source_files)
+guardal_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_guardedalloc', source=source_files)
index 7b757868b9fe517d555de47c35df00f07df8d008..0121024110e7e8b1cb024fe4a9e4780d34a2ca70 100644 (file)
@@ -4,6 +4,7 @@ iksolver_env = Environment()
 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)
@@ -18,4 +19,4 @@ iksolver_env.Append (CPPPATH = ['intern',
                                 '../moto/include',
                                 '../memutil'])
 
-iksolver_env.Library (target='#/lib/blender_IK', source=source_files)
+iksolver_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_IK', source=source_files)
index 5387d76f8f8420be5f6a79855bf0a078a842ba06..6bc45f620886c3c89bdc288cae10cc9eaaf46fc9 100644 (file)
@@ -4,6 +4,7 @@ memutil_env = Environment()
 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)
@@ -12,4 +13,4 @@ source_files = ['intern/MEM_RefCountedC-Api.cpp']
 
 memutil_env.Append (CPPPATH = ['.'])
 
-memutil_env.Library (target='#/lib/blender_MEM', source=source_files)
+memutil_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_MEM', source=source_files)
index ec4f07e4746e51f0f89584d20001b174f0a61782..cc74c942716a1f81826d2fd888783f9eaf87ffcb 100644 (file)
@@ -4,6 +4,7 @@ moto_env = Environment()
 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)
@@ -22,4 +23,4 @@ source_files = ['intern/MT_CmMatrix4x4.cpp',
 
 moto_env.Append (CPPPATH = ['include'])
 
-moto_env.Library (target='#/lib/blender_MT', source=source_files)
+moto_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_MT', source=source_files)
index abb02653e35098a087152b2ff94d6533d683b61a..14304ec73cd6d113d1cbf38b9e6baf962ba59d19 100644 (file)
@@ -4,6 +4,7 @@ string_env = Environment ()
 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)
@@ -12,4 +13,4 @@ source_files = ['intern/STR_String.cpp']
 
 string_env.Append (CPPPATH = ['.'])
 
-string_env.Library (target='#/lib/blender_STR', source=source_files)
+string_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_STR', source=source_files)
index 188c7c300516b4841cf6af42b62175e5ce1f79be..e0005569caf57ae2457aa833487817c6cf20486c 100644 (file)
@@ -1,6 +1,6 @@
-Import ('use_gameengine')
+Import ('user_options_dict')
 
 SConscript(['blender/SConscript',
             'kernel/SConscript'])
-if use_gameengine == 'true':
+if user_options_dict['BUILD_GAMEENGINE'] == 1:
     SConscript (['gameengine/SConscript'])
index 3b01792081d1c40d7f22d55131eee0332135b3ee..0efdb463ba9d596289e2fb926f5e3ed35f8442e3 100644 (file)
@@ -1,29 +1,28 @@
-Import ('use_quicktime')
-Import ('use_international')
+Import ('user_options_dict')
 
-SConscript(['blenloader/SConscript',
+SConscript(['avi/SConscript',
+            'blenkernel/SConscript',
+            'blenlib/SConscript',
+            'blenloader/SConscript',
+            'blenpluginapi/SConscript',
             'deflate/SConscript',
-            'inflate/SConscript',
-            'writestreamglue/SConscript',
-            'readstreamglue/SConscript',
-            'writeblenfile/SConscript',
-            'readblenfile/SConscript',
-            'avi/SConscript',
             'imbuf/SConscript',
             'img/SConscript',
-            'render/SConscript',
-            'radiosity/SConscript',
-            'blenlib/SConscript',
-            'blenkernel/SConscript',
-            'blenpluginapi/SConscript',
-            'python/SConscript',
+            'inflate/SConscript',
             'makesdna/SConscript',
-            'src/SConscript',
+            'python/SConscript',
+            'radiosity/SConscript',
+            'readblenfile/SConscript',
+            'readstreamglue/SConscript',
+            'render/SConscript',
             'renderconverter/SConscript',
+            'src/SConscript',
+            'writeblenfile/SConscript',
+            'writestreamglue/SConscript',
             'yafray/SConscript'])
 
-if use_international == 'true':
+if user_options_dict['USE_INTERNATIONAL'] == 1:
     SConscript (['ftfont/SConscript'])
 
-if use_quicktime == 'true':
+if user_options_dict['USE_QUICKTIME'] == 1:
     SConscript (['quicktime/SConscript'])
index e312c65ff847c9b9e3cbdad132bf0932956735a1..8548178606c425a1a0f94758f77dd9e8472b6548 100644 (file)
@@ -5,6 +5,7 @@ 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)
@@ -21,4 +22,4 @@ avi_env.Append (CPPPATH = ['.',
                            '#/intern/guardedalloc'])
 
 avi_env.Append (CPPPATH=extra_includes)
-avi_env.Library (target='#/lib/blender_avi', source=source_files)
+avi_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_avi', source=source_files)
index e82ebebb2f978b8dfa46c52dee42101416956f9e..7f151f68e26084c290f395747fa8e03f2c1bcc1e 100644 (file)
@@ -4,6 +4,7 @@ blenkernel_env = Environment()
 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)
@@ -57,4 +58,4 @@ blenkernel_env.Append (CPPPATH = ['.',
                                   '#/intern/iksolver/extern',
                                   '../blenloader'])
 
-blenkernel_env.Library (target='#/lib/blender_blenkernel', source=source_files)
+blenkernel_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blenkernel', source=source_files)
index 956e766edf955bcfb66ea536cf03c03f7c462582..d3172a3515f12e599cf3e4cfb4be314a65fb3dca 100644 (file)
@@ -5,6 +5,7 @@ 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)
@@ -38,4 +39,4 @@ blenlib_env.Append (CPPPATH = ['.',
                                '../include'])
 
 blenlib_env.Append (CPPPATH = extra_includes)
-blenlib_env.Library (target='#/lib/blender_blenlib', source=source_files)
+blenlib_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blenlib', source=source_files)
index 2a11d60bf44b78671d4c25f29e0e44d531185993..fdaa06afa62d2d0e15e49ca63fa1433f31f0d937 100644 (file)
@@ -4,6 +4,7 @@ blenloader_env = Environment()
 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)
@@ -26,4 +27,4 @@ blenloader_env.Append (CPPPATH = ['.',
                                   '../writestreamglue',
                                   '../readstreamglue'])
 
-blenloader_env.Library (target='#/lib/blender_blenloader', source=source_files)
+blenloader_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blenloader', source=source_files)
index 33800197f6dc83ad6b5a1514abc6dc2a7ae7c95e..91854db6816e3cc1aeb625cb4c6ac87ebf794d68 100644 (file)
@@ -4,6 +4,7 @@ blenplugin_env = Environment()
 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)
@@ -17,4 +18,4 @@ blenplugin_env.Append (CPPPATH = ['.',
                                   '../imbuf',
                                   '../makesdna'])
 
-blenplugin_env.Library (target='#/lib/blender_blenpluginapi', source=source_files)
+blenplugin_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blenpluginapi', source=source_files)
index d20f7db7fd62cfa8f794a36321398ebd00222d7c..190e4ed416bc87583f1f9f8da7c47b3c74f1c2b5 100644 (file)
@@ -5,6 +5,7 @@ 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)
@@ -18,4 +19,4 @@ deflate_env.Append (CPPPATH = ['.',
                                '../inflate'])
 
 deflate_env.Append (CPPPATH=extra_includes)
-deflate_env.Library (target='#/lib/blender_deflate', source=source_files)
+deflate_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_deflate', source=source_files)
index d75b2abfc37fe5191e9c8e9dc9280a51179e97c2..f44b765ec761fbe4a82a876786e8b6438666cdcb 100644 (file)
@@ -3,6 +3,7 @@ Import ('cflags')
 Import ('cxxflags')
 Import ('extra_includes')
 Import ('defines')
+Import ('user_options_dict')
 
 source_files = ['intern/FTF_Api.cpp',
                 'intern/FTF_TTFont.cpp']
@@ -18,4 +19,4 @@ ftf_env.Append(CPPPATH = include_paths)
 ftf_env.Append(CCFLAGS = cflags)
 ftf_env.Append(CXXFLAGS = cxxflags)
 ftf_env.Append(CPPDEFINES = defines)
-ftf_env.Library (target='#/lib/blender_FTF', source=source_files)
+ftf_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_FTF', source=source_files)
index 52a1795d66636229f163a463afcee9c44ebc591c..d67b80c5b8a2f14b87ccb09ca4e1127f4a183da6 100644 (file)
@@ -5,6 +5,7 @@ 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)
@@ -46,4 +47,4 @@ imbuf_env.Append (CPPPATH = ['.',
                              '../blenkernel'])
 
 imbuf_env.Append (CPPPATH = extra_includes)
-imbuf_env.Library (target='#/lib/blender_imbuf', source=source_files)
+imbuf_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_imbuf', source=source_files)
index 8766eb76ba20581aba4125bb74e9b9016bf808e3..99f8d84e97c331172c83e5a30dfb7d723dc4737f 100644 (file)
@@ -4,6 +4,7 @@ img_env = Environment()
 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)
@@ -16,4 +17,4 @@ source_files = ['intern/IMG_Api.cpp',
                 'intern/IMG_PixmapRGBA32.cpp',
                 'intern/IMG_Rect.cpp']
 
-img_env.Library (target='#/lib/blender_img', source=source_files)
+img_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_img', source=source_files)
index 4ffb3b48ebc3b5ca32572112f6efd867a5a8ee5b..65bb8586799ad59fdefb015c1f29f1d024385d4c 100644 (file)
@@ -6,6 +6,7 @@ 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)
@@ -17,4 +18,4 @@ inflate_env.Append (CPPPATH = ['.',
                                '../readstreamglue'])
 
 inflate_env.Append (CPPPATH = extra_includes)
-inflate_env.Library (target='#/lib/blender_inflate', source=source_files)
+inflate_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_inflate', source=source_files)
index 8a496e383da6f8d1457a7ada21de7029e5855722..a73336c1aed86c718e33d5184329dbea5f77692f 100644 (file)
@@ -4,6 +4,7 @@ makesdna_env = Environment()
 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)
@@ -15,4 +16,4 @@ objs.append (o)
 
 makesdna_env.Append (CPPPATH = ['#/intern/guardedalloc'])
 
-makesdna_env.Library (target='#/lib/blender_makesdna', source=objs)
+makesdna_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_makesdna', source=objs)
index f636b228a638b9e728814d631b1d86c6f227058d..5924dcb7eb33d667b1d59614b2998aacf3fb4efa 100644 (file)
@@ -6,7 +6,7 @@ Import ('defines')
 Import ('platform_libs')
 Import ('platform_libpath')
 Import ('platform_linkflags')
-Import ('root_build_dir')
+Import ('user_options_dict')
 
 if sys.platform=='win32':
     platform_linkflags = ['/SUBSYSTEM:CONSOLE',
@@ -33,14 +33,14 @@ 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 = '#/lib')
+makesdna_tool.Append (LIBPATH = '#'+user_options_dict['BUILD_DIR']+'/lib')
 makesdna_tool.Append (LIBS = 'blender_guardedalloc')
-makesdna_tool.Program (target = '#'+root_build_dir+'makesdna', source = source_files)
+makesdna_tool.Program (target = '#'+user_options_dict['BUILD_DIR']+'makesdna', source = source_files)
 
 dna = Environment ()
 dna_dict = dna.Dictionary()
-makesdna_name = root_build_dir+'makesdna' + dna_dict['PROGSUFFIX']
+makesdna_name = user_options_dict['BUILD_DIR']+'makesdna' + dna_dict['PROGSUFFIX']
 dna.Depends ('dna.c', '#'+makesdna_name)
-dna.Command ('dna.c', '', root_build_dir+"makesdna $TARGET")
+dna.Command ('dna.c', '', user_options_dict['BUILD_DIR']+"makesdna $TARGET")
 obj = 'intern/dna.c'
 Return ('obj')
index 02a9444b128203fa051be3198cac05f5d17d889a..66b359bc61e8b53c2289e60b584936e79c0328fb 100644 (file)
@@ -6,6 +6,7 @@ Import ('cxxflags')
 Import ('defines')
 Import ('python_include')
 Import ('extra_includes')
+Import ('user_options_dict')
 python_env.Append (CCFLAGS = cflags)
 python_env.Append (CXXFLAGS = cxxflags)
 python_env.Append (CPPDEFINES = defines)
@@ -60,4 +61,4 @@ python_env.Append (CPPPATH = ['api2_2x',
                               python_include])
 
 python_env.Append (CPPPATH = extra_includes)
-python_env.Library (target='#/lib/blender_python', source=source_files)
+python_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_python', source=source_files)
index bcc1792d586cfca0cd9152d0747b444a366c6c9f..07c22398fef3d69fc267cfb65ef4a08522c2bf9d 100644 (file)
@@ -5,6 +5,7 @@ Import ('cflags')
 Import ('cxxflags')
 Import ('extra_includes')
 Import ('defines')
+Import ('user_options_dict')
 quicktime_env.Append (CCFLAGS = cflags)
 quicktime_env.Append (CXXFLAGS = cxxflags)
 quicktime_env.Append (CPPPATH = extra_includes)
@@ -24,4 +25,4 @@ quicktime_env.Append (CPPPATH = ['.',
                                  '../readstreamglue',
                                  '../render/extern/include'])
 
-quicktime_env.Library (target='#/lib/blender_quicktime', source=source_files)
+quicktime_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_quicktime', source=source_files)
index e88e896f09505e6addb5a6c4500393a078261851..512d7dad0a468d9f23dc4874afc148ed143e9c32 100644 (file)
@@ -4,6 +4,7 @@ rad_env = Environment ()
 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)
@@ -24,4 +25,4 @@ rad_env.Append (CPPPATH = ['extern/include',
                            '#/intern/guardedalloc',
                            '../render/extern/include'])
 
-rad_env.Library (target='#/lib/blender_radiosity', source=source_files)
+rad_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_radiosity', source=source_files)
index 4ba91d55c9ac3c74c880be2bc60861321e48ad2f..4452b21f7183299ca8633913fd69f44641f1dc92 100644 (file)
@@ -4,6 +4,7 @@ readblenfile_env = Environment()
 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)
@@ -16,4 +17,4 @@ readblenfile_env.Append (CPPPATH = ['.',
                                     '../blenkernel',
                                     '../../kernel/gen_messaging'])
 
-readblenfile_env.Library (target='#/lib/blender_readblenfile', source=source_files)
+readblenfile_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_readblenfile', source=source_files)
index d1dc3084db6650c9ebd93aca3b4d1275467db0c9..3c96bcca9b0b63490ff3703c5874f8d08095bcfb 100644 (file)
@@ -5,6 +5,7 @@ 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)
@@ -18,4 +19,4 @@ readstrgl_env.Append (CPPPATH = ['.',
                                  '../inflate'])
 
 readstrgl_env.Append (CPPPATH = extra_includes)
-readstrgl_env.Library (target='#/lib/blender_readstreamglue', source=source_files)
+readstrgl_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_readstreamglue', source=source_files)
index 311f90d27d65e3979c08dd7cb20d7d93f87c02bd..ea9d30a7003b03b4dea6a8031eb5b64e114bf1fe 100644 (file)
@@ -4,6 +4,7 @@ render_env = Environment()
 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)
@@ -43,4 +44,4 @@ render_env.Append (CPPPATH = ['intern/include',
                               '../../kernel/gen_messaging',
                               '../yafray'])
 
-render_env.Library (target='#/lib/blender_render', source=source_files)
+render_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_render', source=source_files)
index b3f49dd94510fd0a02f4d56a0da6a204a242be48..1cd12c181f91a236513e34e534cce537664e91d1 100644 (file)
@@ -4,6 +4,7 @@ renderconv_env = Environment()
 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)
@@ -19,4 +20,4 @@ renderconv_env.Append (CPPPATH = ['.',
                                   '../render/extern/include',
                                   '../python'])
 
-renderconv_env.Library (target='#/lib/blender_renderconverter', source=source_files)
+renderconv_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_renderconverter', source=source_files)
index 8b84934271f070735f6a230fbba8b84983fe503c..c718ad1c90fda87c734656c9e8d394a2ce42965b 100644 (file)
@@ -8,7 +8,7 @@ Import ('python_include')
 Import ('sdl_cflags')
 Import ('sdl_include')
 Import ('extra_includes')
-Import ('use_international')
+Import ('user_options_dict')
 src_env.Append (CCFLAGS = cflags)
 src_env.Append (CCFLAGS = sdl_cflags)
 src_env.Append (CXXFLAGS = cxxflags)
@@ -140,9 +140,9 @@ src_env.Append (CPPPATH = ['#/intern/guardedalloc',
                            python_include,
                            sdl_include])
 
-if use_international=='true':
+if user_options_dict['USE_INTERNATIONAL'] == 1:
     src_env.Append (CPPPATH=['../ftfont'])
 
 src_env.Append (CPPPATH=extra_includes)
 
-src_env.Library (target='#/lib/blender_blendersrc', source=source_files)
+src_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blendersrc', source=source_files)
index c669b495cfc5119820ad619b709d537054feacb4..48a1cba4949a81457574f37280ec1b943f6c0482 100644 (file)
@@ -5,6 +5,7 @@ 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)
@@ -19,4 +20,4 @@ wrblenfile_env.Append (CPPPATH = ['.',
                                   '../readblenfile'])
 
 wrblenfile_env.Append (CPPPATH = extra_includes)
-wrblenfile_env.Library (target='#/lib/blender_writeblenfile', source=source_files)
+wrblenfile_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_writeblenfile', source=source_files)
index 455f53b3306069e6b977ebc36f743b8c5c214f5d..aa2d4d10e2ea875fbe82ce1cb57a4039242c803e 100644 (file)
@@ -5,6 +5,7 @@ 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)
@@ -21,4 +22,4 @@ wrstrgl_env.Append (CPPPATH = ['.',
                                '../../kernel/gen_messaging'])
 
 wrstrgl_env.Append (CPPPATH = extra_includes)
-wrstrgl_env.Library (target='#/lib/blender_writestreamglue', source=source_files)
+wrstrgl_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_writestreamglue', source=source_files)
index aa721ecb004093559f285efdd8931569a0538405..88cc6ff44bcf57087c698382bb06fbc03ef32b82 100644 (file)
@@ -4,6 +4,7 @@ yafray_env = Environment()
 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)
@@ -19,4 +20,4 @@ yafray_env.Append (CPPPATH = ['#/intern/guardedalloc',
                               '../imbuf',
                               '../render/extern/include'])
 
-yafray_env.Library (target='#/lib/blender_yafray', source=source_files)
+yafray_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_yafray', source=source_files)
index 2116f9fec3b611bf675c8fb6b5bb0bb01e5ff167..0e39cf0210791c9332356d9bf722ac312f1ec193 100755 (executable)
@@ -5,6 +5,8 @@ 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)
 kx_blenderhook_env.Append (CPPDEFINES = defines)
@@ -46,7 +48,7 @@ kx_blenderhook_env.Append (CPPPATH=['.',
                                     '#intern/SoundSystem',
                                     '#source/blender/misc',
                                     '#source/blender/blenloader',
-                                    '#../lib/windows/solid/include',
+                                    solid_include,
                                     ])
 
-kx_blenderhook_env.Library (target='#/lib/KX_blenderhook', source=source_files)
+kx_blenderhook_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_blenderhook', source=source_files)
index 9567844c8ddf3bca7443e2396a3689266b23f7ce..795274ca3457251ea021cb76c36355fbcb34ec49 100755 (executable)
@@ -6,6 +6,7 @@ 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)
 kx_converter_env.Append (CPPDEFINES = defines)
@@ -66,4 +67,4 @@ kx_converter_env.Append (CPPPATH = ['.',
                                     solid_include
                                     ])
 
-kx_converter_env.Library (target='#/lib/KX_converter', source=source_files)
+kx_converter_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_converter', source=source_files)
index c750bcd3e1ad3e1f60b07322a11f604581bce4df..5a5205bd3bc856a13345987c36d4dc46a56c0568 100755 (executable)
@@ -5,6 +5,7 @@ Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
 Import ('python_include')
+Import ('user_options_dict')
 expressions_env.Append (CCFLAGS = cflags)
 expressions_env.Append (CXXFLAGS = cxxflags)
 expressions_env.Append (CPPDEFINES = defines)
@@ -34,4 +35,4 @@ expressions_env.Append (CPPPATH = ['.',
                                    '#intern/string',
                                    python_include])
 
-expressions_env.Library (target='#/lib/blender_expressions', source=source_files)
+expressions_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_expressions', source=source_files)
index c61b708ec43848450ce1370bcf70b0351df4db95..33de774b314eab02f5b4d219568c9241fc421bc5 100755 (executable)
@@ -5,6 +5,7 @@ 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)
 sca_gamelogic_env.Append (CPPDEFINES = defines)
@@ -45,4 +46,4 @@ sca_gamelogic_env.Append (CPPPATH=['.',
                                    python_include,
                                   ])
 
-sca_gamelogic_env.Library (target='#/lib/SCA_GameLogic', source=source_files)
+sca_gamelogic_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/SCA_GameLogic', source=source_files)
index 61e31bb0f66d3c4f1cc9740480f56f527c964ea2..43dc4998c366f82b51e05fde7cb6cbe619f49678 100755 (executable)
@@ -5,6 +5,7 @@ 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)
 kx_network_env.Append (CPPDEFINES = defines)
@@ -26,4 +27,4 @@ kx_network_env.Append (CPPPATH = ['.',
                                   '#source/gameengine/Network',
                                  ])
 
-kx_network_env.Library (target='#/lib/KX_network', source=source_files)
+kx_network_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_network', source=source_files)
index 75eff21013748a132c2a61142c4bad8acb79e79f..f035f5f4b9e12ee0762d4457d5f262ab9ffec27e 100644 (file)
@@ -4,10 +4,9 @@ ketsji_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
-Import ('use_sumo')
-Import ('use_ode')
 Import ('python_include')
 Import ('solid_include')
+Import ('user_options_dict')
 ketsji_env.Append (CCFLAGS = cflags)
 ketsji_env.Append (CXXFLAGS = cxxflags)
 ketsji_env.Append (CPPDEFINES = defines)
@@ -62,11 +61,11 @@ source_files = ['KX_WorldIpoController.cpp',
                 'KX_Camera.cpp'
                 ]
 
-if use_sumo == 'true':
+if user_options_dict['USE_PHYSICS'] == 'solid':
     source_files += ['KX_SumoPhysicsController.cpp']
     ketsji_env.Append (CPPPATH = [solid_include])
 
-if use_ode == 'true':
+if user_options_dict['USE_PHYSICS'] == 'ode':
     source_files += ['KX_OdePhysicsController.cpp']
 
 ketsji_env.Append (CPPPATH = ['.',
@@ -108,4 +107,4 @@ ketsji_env.Append (CPPPATH = ['.',
                               python_include
                              ])
 
-ketsji_env.Library (target='#/lib/KX_ketsji', source=source_files)
+ketsji_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_ketsji', source=source_files)
index a6cd3c435faba7ae9d395a694939b51b0a827535..65157902f48ddb48a9415a16f65d6dd23acf4068 100755 (executable)
@@ -4,6 +4,7 @@ ng_loopbacknetwork_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 ng_loopbacknetwork_env.Append (CCFLAGS = cflags)
 ng_loopbacknetwork_env.Append (CXXFLAGS = cxxflags)
 ng_loopbacknetwork_env.Append (CPPDEFINES = defines)
@@ -16,4 +17,4 @@ ng_loopbacknetwork_env.Append (CPPPATH=['.',
                                         '#source/gameengine/Network',
                                        ])
 
-ng_loopbacknetwork_env.Library (target='#/lib/NG_loopbacknetwork', source=source_files)
+ng_loopbacknetwork_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/NG_loopbacknetwork', source=source_files)
index 443803f9ce3d5f0b4d1078f9f39cd81f5667da6e..15c42cae371158441dd064f71cd70515596e7547 100755 (executable)
@@ -4,6 +4,7 @@ ng_network_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 ng_network_env.Append (CCFLAGS = cflags)
 ng_network_env.Append (CXXFLAGS = cxxflags)
 ng_network_env.Append (CPPDEFINES = defines)
@@ -17,4 +18,4 @@ ng_network_env.Append (CPPPATH=['.',
                                 '#intern/string'
                                ])
 
-ng_network_env.Library (target='#/lib/NG_network', source=source_files)
+ng_network_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/NG_network', source=source_files)
index 43ddbd31c06ac6b1d8ed13a8877a2a6f32cfe78c..0d5804cf5ac029b4a7de03da0272c2cef71a907e 100755 (executable)
@@ -5,6 +5,7 @@ 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)
 phy_ode_env.Append (CPPDEFINES = defines)
@@ -17,4 +18,4 @@ phy_ode_env.Append (CPPPATH=['.',
                              ode_include
                             ])
 
-phy_ode_env.Library (target='#/lib/PHY_Ode', source=source_files)
+phy_ode_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Ode', source=source_files)
index 746c16bb9f34047b7e0869ab1bf283178be82f53..7d634918b385dacd850307c21da44d8d29334550 100755 (executable)
@@ -4,6 +4,7 @@ phy_dummy_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 phy_dummy_env.Append (CCFLAGS = cflags)
 phy_dummy_env.Append (CXXFLAGS = cxxflags)
 phy_dummy_env.Append (CPPDEFINES = defines)
@@ -14,4 +15,4 @@ phy_dummy_env.Append (CPPPATH = ['.',
                                  '../common'
                                 ])
 
-phy_dummy_env.Library (target='#/lib/PHY_Dummy', source=source_files)
+phy_dummy_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Dummy', source=source_files)
index a59e66cd850c4d2ef2348a26d5d5b4a4d79c270f..556b470f60e6de06a6cb80a79ac1ab8233915b35 100755 (executable)
@@ -5,6 +5,7 @@ Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
 Import ('solid_include')
+Import ('user_options_dict')
 phy_sumo_env.Append (CCFLAGS = cflags)
 phy_sumo_env.Append (CXXFLAGS = cxxflags)
 phy_sumo_env.Append (CPPDEFINES = defines)
@@ -22,4 +23,4 @@ phy_sumo_env.Append (CPPPATH = ['.',
                                 '#/intern/moto/include'
                                ])
 
-phy_sumo_env.Library (target='#/lib/PHY_Sumo', source=source_files)
+phy_sumo_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Sumo', source=source_files)
index 81cc93fa3c1954ae10fa2f50b6c40bc6087f741f..016f06b39d3d56650bf8990f162bf63e9477f9f3 100755 (executable)
@@ -4,6 +4,7 @@ phy_physics_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 phy_physics_env.Append (CCFLAGS = cflags)
 phy_physics_env.Append (CXXFLAGS = cxxflags)
 phy_physics_env.Append (CPPDEFINES = defines)
@@ -16,4 +17,4 @@ phy_physics_env.Append (CPPPATH = ['.',
                                    '../Dummy'
                                   ])
 
-phy_physics_env.Library (target='#/lib/PHY_Physics', source=source_files)
+phy_physics_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Physics', source=source_files)
index d1dd79b55e8c4b021611fd9da3c16c645ba75f00..88747440ed76e96850c276a237fc4f3f6fa09560 100755 (executable)
@@ -4,6 +4,7 @@ ras_openglrasterizer_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 ras_openglrasterizer_env.Append (CCFLAGS = cflags)
 ras_openglrasterizer_env.Append (CXXFLAGS = cxxflags)
 ras_openglrasterizer_env.Append (CPPDEFINES = defines)
@@ -19,4 +20,4 @@ ras_openglrasterizer_env.Append (CPPPATH=['.',
                                           '#source/gameengine/Rasterizer'
                                          ])
 
-ras_openglrasterizer_env.Library (target='#/lib/RAS_OpenGLRasterizer', source=source_files)
+ras_openglrasterizer_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/RAS_OpenGLRasterizer', source=source_files)
index 5d8b31d53ec77806b1362df586be5b137e9aa627..b27992e6b5c1298bb192d85b5b979602ef2418a8 100755 (executable)
@@ -4,6 +4,7 @@ ras_rasterizer_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 ras_rasterizer_env.Append (CCFLAGS = cflags)
 ras_rasterizer_env.Append (CXXFLAGS = cxxflags)
 ras_rasterizer_env.Append (CPPDEFINES = defines)
@@ -24,4 +25,4 @@ ras_rasterizer_env.Append (CPPPATH=['.',
                                     '#intern/moto/include'
                                    ])
 
-ras_rasterizer_env.Library (target='#/lib/RAS_rasterizer', source=source_files)
+ras_rasterizer_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/RAS_rasterizer', source=source_files)
index 9ae0df1a8aa04ed3b26ab4fc7f30b3b46af20372..1984c121b00f28fd2bf2c7c32d5c7d3879391a47 100644 (file)
@@ -1,22 +1,21 @@
-Import ('use_ode')
-Import ('use_sumo')
+Import ('user_options_dict')
 
-SConscript(['Ketsji/SConscript',
-            'Ketsji/KXNetwork/SConscript',
-            'Expressions/SConscript',
-            'BlenderRoutines/SConscript',
+SConscript(['BlenderRoutines/SConscript',
             'Converter/SConscript',
+            'Expressions/SConscript',
+            'GameLogic/SConscript',
+            'Ketsji/SConscript',
+            'Ketsji/KXNetwork/SConscript',
             'Network/SConscript',
             'Network/LoopBackNetwork/SConscript',
-            'GameLogic/SConscript',
             'Physics/common/SConscript',
             'Physics/Dummy/SConscript',
             'Rasterizer/SConscript',
             'Rasterizer/RAS_OpenGLRasterizer/SConscript',
             'SceneGraph/SConscript'])
 
-if use_sumo == 'true':
+if user_options_dict['USE_PHYSICS'] == 'solid':
     SConscript(['Physics/Sumo/SConscript'])
 
-if use_ode == 'true':
+if user_options_dict['USE_PHYSICS'] == 'ode':
     SConscript(['Physics/BlOde/SConscript'])
index 6f51bef79893821fb7c075caa0aafe70469b7419..4e98000a36c3a6d76b6d4acc0f27cc08e035435a 100755 (executable)
@@ -4,6 +4,7 @@ sg_scenegraph_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 sg_scenegraph_env.Append (CCFLAGS = cflags)
 sg_scenegraph_env.Append (CXXFLAGS = cxxflags)
 sg_scenegraph_env.Append (CPPDEFINES = defines)
@@ -17,4 +18,4 @@ sg_scenegraph_env.Append (CPPPATH=['.',
                                    '#intern/moto/include'
                                   ])
 
-sg_scenegraph_env.Library (target='#/lib/SG_SceneGraph', source=source_files)
+sg_scenegraph_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/SG_SceneGraph', source=source_files)
index 0439f7169bc2b7cd55813d563c95d419080ad57b..88e968b66c64370e9847207ba69d3f5818af7c05 100644 (file)
@@ -4,6 +4,7 @@ kernel_env = Environment ()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 kernel_env.Append (CCFLAGS = cflags)
 kernel_env.Append (CXXFLAGS = cxxflags)
 kernel_env.Append (CPPDEFINES = defines)
@@ -19,4 +20,4 @@ kernel_env.Append (CPPPATH = ['gen_messaging',
                               '#/intern/string',
                               '#/intern/moto/include'])
 
-kernel_env.Library (target='#/lib/blender_kernel', source=source_files)
+kernel_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_kernel', source=source_files)