[Bf-blender-cvs] [2cb6348] master: Fix scons build error compiling 32 bit OS X built on 64 bit.

Brecht Van Lommel noreply at git.blender.org
Sat Nov 23 07:12:26 CET 2013


Commit: 2cb63486a9cedf79aa4e10a26338acf8d7d7e94c
Author: Brecht Van Lommel
Date:   Sat Nov 23 06:50:19 2013 +0100
http://developer.blender.org/rB2cb63486a9cedf79aa4e10a26338acf8d7d7e94c

Fix scons build error compiling 32 bit OS X built on 64 bit.

===================================================================

M	intern/locale/SConscript

===================================================================

diff --git a/intern/locale/SConscript b/intern/locale/SConscript
index 42941e2..4136ac8 100644
--- a/intern/locale/SConscript
+++ b/intern/locale/SConscript
@@ -58,9 +58,9 @@ if env['WITH_BF_INTERNATIONAL']:
             os.makedirs(build_dir)
 
         msgfmt_tool = env.Clone()
+        msgfmt_tool.Append(LINKFLAGS = env['PLATFORM_LINKFLAGS'])
+
         targetpath = root_build_dir + '/msgfmt'
-        if env['OURPLATFORM'] == 'darwin':
-            msgfmt_tool.Replace( LINKFLAGS = '/usr/lib/libgcc_s.1.dylib /usr/lib/libstdc++.6.dylib /usr/lib/libSystem.B.dylib') # only need these dependencies
 
         msgfmt_target = msgfmt_tool.Program(target = targetpath, source = ['msgfmt.cc'])




More information about the Bf-blender-cvs mailing list