diff options
| author | Michel Selten <michel@mselten.demon.nl> | 2004-02-15 22:25:32 +0300 |
|---|---|---|
| committer | Michel Selten <michel@mselten.demon.nl> | 2004-02-15 22:25:32 +0300 |
| commit | 9330e553e88fe77b3a08cfac3a13046031b58e56 (patch) | |
| tree | 69b9155aad185dc347bef0dcffaf8c538980fb72 /intern/string/SConscript | |
| parent | 2fbf2b3775405566eb5906da2c7223eb9b626427 (diff) | |
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.
Diffstat (limited to 'intern/string/SConscript')
| -rw-r--r-- | intern/string/SConscript | 3 |
1 files changed, 2 insertions, 1 deletions
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) |