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. --- source/blender/avi/SConscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/avi') diff --git a/source/blender/avi/SConscript b/source/blender/avi/SConscript index e312c65ff84..8548178606c 100644 --- a/source/blender/avi/SConscript +++ b/source/blender/avi/SConscript @@ -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) -- cgit v1.2.3