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.
This commit is contained in:
@@ -4,6 +4,7 @@ guardal_env = Environment()
|
||||
Import ('cflags')
|
||||
Import ('cxxflags')
|
||||
Import ('defines')
|
||||
Import ('user_options_dict')
|
||||
guardal_env.Append (CCFLAGS = cflags)
|
||||
guardal_env.Append (CXXFLAGS = cxxflags)
|
||||
guardal_env.Append (CPPDEFINES = defines)
|
||||
@@ -12,4 +13,4 @@ source_files = ['intern/mallocn.c']
|
||||
|
||||
guardal_env.Append (CPPPATH = ['.'])
|
||||
|
||||
guardal_env.Library (target='#/lib/blender_guardedalloc', source=source_files)
|
||||
guardal_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_guardedalloc', source=source_files)
|
||||
|
Reference in New Issue
Block a user