Commit: 5d85949b2d703f26ed98eb720d26cd8130c0975e
Author: Sergey Sharybin
Date: Thu Nov 20 15:28:37 2014 +0500
Branches: master
https://developer.blender.org/rB5d85949b2d703f26ed98eb720d26cd8130c0975e
SCons: Remove duplicate PLATFORM_LINKFLAGS from makesdna and makesrna
Hopefully it'll fix "anonymous version tag cannot be combined with other
version"
compilation error.
===================================================================
M source/blender/makesdna/intern/SConscript
M source/blender/makesrna/intern/SConscript
===================================================================
diff --git a/source/blender/makesdna/intern/SConscript
b/source/blender/makesdna/intern/SConscript
index 50c26eb..de84f6f 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 28151fe..192923f 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'])
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
