diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-11-20 17:27:10 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-11-20 17:27:10 +0300 |
| commit | e05be6bdbd8943bc87212bb430b322ffea366a32 (patch) | |
| tree | 8b4b713726e0356255185bb3f212481a81c64648 /source | |
| parent | 391096252b8848099517f4e78dec020e4707f2a3 (diff) | |
SCons: Proper solution for local symbols map
Configuration used to override the link flags, it better restore them
once the configuration is done.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/makesdna/intern/SConscript | 1 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/SConscript | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index de84f6f8ab8..50c26eb6732 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -64,6 +64,7 @@ if sys.platform != 'cygwin': makesdna_tool.Append (CPPDEFINES = defines) makesdna_tool.Append( CFLAGS = env['CFLAGS']) makesdna_tool.Append( CCFLAGS = env['CCFLAGS']) +makesdna_tool.Append( LINKFLAGS = env['PLATFORM_LINKFLAGS']) targetdir = normpath(root_build_dir+'/lib') if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index 192923fb4b6..28151fe5db1 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -191,6 +191,7 @@ makesrna_tool.Append (LIBPATH = libdir) makesrna_tool.Append( CFLAGS = env['CFLAGS']) makesrna_tool.Append( CCFLAGS = env['CCFLAGS']) +makesrna_tool.Append( LINKFLAGS = env['PLATFORM_LINKFLAGS']) if env['BF_PROFILE']: makesrna_tool.Append (LINKFLAGS = env['BF_PROFILE_FLAGS']) |