diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-11-20 13:28:37 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-11-20 13:30:19 +0300 |
| commit | 5d85949b2d703f26ed98eb720d26cd8130c0975e (patch) | |
| tree | d025775de260ae8d0836db9e3aba3250565ce82f /source | |
| parent | 8b2fbd6bbf6f4a56dbc1fa899dd44e21a2c17d0a (diff) | |
SCons: Remove duplicate PLATFORM_LINKFLAGS from makesdna and makesrna
Hopefully it'll fix "anonymous version tag cannot be combined with other version"
compilation error.
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, 0 insertions, 2 deletions
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 50c26eb6732..de84f6f8ab8 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -64,7 +64,6 @@ 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 28151fe5db1..192923fb4b6 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -191,7 +191,6 @@ 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']) |