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/makesdna | |
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/makesdna')
-rw-r--r-- | source/blender/makesdna/SConscript | 3 | ||||
-rw-r--r-- | source/blender/makesdna/intern/SConscript | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/makesdna/SConscript b/source/blender/makesdna/SConscript index 8a496e383da..a73336c1aed 100644 --- a/source/blender/makesdna/SConscript +++ b/source/blender/makesdna/SConscript @@ -4,6 +4,7 @@ makesdna_env = Environment() Import ('cflags') Import ('cxxflags') Import ('defines') +Import ('user_options_dict') makesdna_env.Append (CCFLAGS = cflags) makesdna_env.Append (CXXFLAGS = cxxflags) makesdna_env.Append (CPPDEFINES = defines) @@ -15,4 +16,4 @@ objs.append (o) makesdna_env.Append (CPPPATH = ['#/intern/guardedalloc']) -makesdna_env.Library (target='#/lib/blender_makesdna', source=objs) +makesdna_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_makesdna', source=objs) diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index f636b228a63..5924dcb7eb3 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -6,7 +6,7 @@ Import ('defines') Import ('platform_libs') Import ('platform_libpath') Import ('platform_linkflags') -Import ('root_build_dir') +Import ('user_options_dict') if sys.platform=='win32': platform_linkflags = ['/SUBSYSTEM:CONSOLE', @@ -33,14 +33,14 @@ makesdna_tool.Append (CCFLAGS = cflags) makesdna_tool.Append (CXXFLAGS = cxxflags) makesdna_tool.Append (CPPDEFINES = defines) makesdna_tool.Append (LINKFLAGS = platform_linkflags) -makesdna_tool.Append (LIBPATH = '#/lib') +makesdna_tool.Append (LIBPATH = '#'+user_options_dict['BUILD_DIR']+'/lib') makesdna_tool.Append (LIBS = 'blender_guardedalloc') -makesdna_tool.Program (target = '#'+root_build_dir+'makesdna', source = source_files) +makesdna_tool.Program (target = '#'+user_options_dict['BUILD_DIR']+'makesdna', source = source_files) dna = Environment () dna_dict = dna.Dictionary() -makesdna_name = root_build_dir+'makesdna' + dna_dict['PROGSUFFIX'] +makesdna_name = user_options_dict['BUILD_DIR']+'makesdna' + dna_dict['PROGSUFFIX'] dna.Depends ('dna.c', '#'+makesdna_name) -dna.Command ('dna.c', '', root_build_dir+"makesdna $TARGET") +dna.Command ('dna.c', '', user_options_dict['BUILD_DIR']+"makesdna $TARGET") obj = 'intern/dna.c' Return ('obj') |