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/ghost | |
| 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/ghost')
| -rw-r--r-- | intern/ghost/SConscript | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 7a2b34dcf21..7dbcb2703c6 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -4,12 +4,12 @@ ghost_env = Environment() Import ('cflags') Import ('cxxflags') Import ('defines') +Import ('user_options_dict') +Import ('window_system') ghost_env.Append (CCFLAGS = cflags) ghost_env.Append (CXXFLAGS = cxxflags) ghost_env.Append (CPPDEFINES = defines) -Import ('window_system') - source_files = ['intern/GHOST_Buttons.cpp', 'intern/GHOST_C-api.cpp', 'intern/GHOST_CallbackEventConsumer.cpp', @@ -42,4 +42,4 @@ else: ghost_env.Append (CPPPATH = ['.', '../string']) -ghost_env.Library (target='#/lib/blender_GHOST', source=source_files) +ghost_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_GHOST', source=source_files) |