Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Selten <michel@mselten.demon.nl>2004-02-15 22:25:32 +0300
committerMichel Selten <michel@mselten.demon.nl>2004-02-15 22:25:32 +0300
commit9330e553e88fe77b3a08cfac3a13046031b58e56 (patch)
tree69b9155aad185dc347bef0dcffaf8c538980fb72 /source/blender/blenloader/SConscript
parent2fbf2b3775405566eb5906da2c7223eb9b626427 (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/blenloader/SConscript')
-rw-r--r--source/blender/blenloader/SConscript3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenloader/SConscript b/source/blender/blenloader/SConscript
index 2a11d60bf44..fdaa06afa62 100644
--- a/source/blender/blenloader/SConscript
+++ b/source/blender/blenloader/SConscript
@@ -4,6 +4,7 @@ blenloader_env = Environment()
Import ('cflags')
Import ('cxxflags')
Import ('defines')
+Import ('user_options_dict')
blenloader_env.Append (CCFLAGS = cflags)
blenloader_env.Append (CXXFLAGS = cxxflags)
blenloader_env.Append (CPPDEFINES = defines)
@@ -26,4 +27,4 @@ blenloader_env.Append (CPPPATH = ['.',
'../writestreamglue',
'../readstreamglue'])
-blenloader_env.Library (target='#/lib/blender_blenloader', source=source_files)
+blenloader_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blenloader', source=source_files)