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 /source/blender/img | |
| 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 'source/blender/img')
| -rw-r--r-- | source/blender/img/SConscript | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/img/SConscript b/source/blender/img/SConscript index 8766eb76ba2..99f8d84e97c 100644 --- a/source/blender/img/SConscript +++ b/source/blender/img/SConscript @@ -4,6 +4,7 @@ img_env = Environment() Import ('cflags') Import ('cxxflags') Import ('defines') +Import ('user_options_dict') img_env.Append (CCFLAGS = cflags) img_env.Append (CXXFLAGS = cxxflags) img_env.Append (CPPDEFINES = defines) @@ -16,4 +17,4 @@ source_files = ['intern/IMG_Api.cpp', 'intern/IMG_PixmapRGBA32.cpp', 'intern/IMG_Rect.cpp'] -img_env.Library (target='#/lib/blender_img', source=source_files) +img_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_img', source=source_files) |