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/bmfont | |
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/bmfont')
-rw-r--r-- | intern/bmfont/SConscript | 3 |
1 files changed, 2 insertions, 1 deletions
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) |