From 9330e553e88fe77b3a08cfac3a13046031b58e56 Mon Sep 17 00:00:00 2001 From: Michel Selten Date: Sun, 15 Feb 2004 19:25:32 +0000 Subject: SCons updates * 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. --- intern/SoundSystem/SConscript | 12 +++++------- intern/bmfont/SConscript | 3 ++- intern/bsp/SConscript | 3 ++- intern/container/SConscript | 3 ++- intern/decimation/SConscript | 3 ++- intern/ghost/SConscript | 6 +++--- intern/guardedalloc/SConscript | 3 ++- intern/iksolver/SConscript | 3 ++- intern/memutil/SConscript | 3 ++- intern/moto/SConscript | 3 ++- intern/string/SConscript | 3 ++- 11 files changed, 26 insertions(+), 19 deletions(-) (limited to 'intern') diff --git a/intern/SoundSystem/SConscript b/intern/SoundSystem/SConscript index d6d87213962..16f4e4b8a3a 100644 --- a/intern/SoundSystem/SConscript +++ b/intern/SoundSystem/SConscript @@ -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) diff --git a/intern/bmfont/SConscript b/intern/bmfont/SConscript index 3ba26e6b74c..5779fd25cbb 100644 --- a/intern/bmfont/SConscript +++ b/intern/bmfont/SConscript @@ -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) diff --git a/intern/bsp/SConscript b/intern/bsp/SConscript index d60bad299e2..975c9c9ba7d 100644 --- a/intern/bsp/SConscript +++ b/intern/bsp/SConscript @@ -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) diff --git a/intern/container/SConscript b/intern/container/SConscript index d916e7e221c..6e03cc9d900 100644 --- a/intern/container/SConscript +++ b/intern/container/SConscript @@ -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) diff --git a/intern/decimation/SConscript b/intern/decimation/SConscript index 7846cc1667f..8bb7b9873f8 100644 --- a/intern/decimation/SConscript +++ b/intern/decimation/SConscript @@ -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) diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 7a2b34dcf21..7dbcb2703c6 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -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) diff --git a/intern/guardedalloc/SConscript b/intern/guardedalloc/SConscript index 23e4faa75fe..21e2c8f66b0 100644 --- a/intern/guardedalloc/SConscript +++ b/intern/guardedalloc/SConscript @@ -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) diff --git a/intern/iksolver/SConscript b/intern/iksolver/SConscript index 7b757868b9f..0121024110e 100644 --- a/intern/iksolver/SConscript +++ b/intern/iksolver/SConscript @@ -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) diff --git a/intern/memutil/SConscript b/intern/memutil/SConscript index 5387d76f8f8..6bc45f62088 100644 --- a/intern/memutil/SConscript +++ b/intern/memutil/SConscript @@ -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) diff --git a/intern/moto/SConscript b/intern/moto/SConscript index ec4f07e4746..cc74c942716 100644 --- a/intern/moto/SConscript +++ b/intern/moto/SConscript @@ -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) diff --git a/intern/string/SConscript b/intern/string/SConscript index abb02653e35..14304ec73cd 100644 --- a/intern/string/SConscript +++ b/intern/string/SConscript @@ -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) -- cgit v1.2.3