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/container/SConscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'intern/container') 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) -- cgit v1.2.3