[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52284] trunk/blender/SConstruct: OSX/ scons/osl: use Xlinker for the BF_PROGRAM_LINKFLAGS, so we can alternative again compile with gcc-4.6
jens verwiebe
info at jensverwiebe.de
Fri Nov 16 16:18:14 CET 2012
Revision: 52284
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52284
Author: jensverwiebe
Date: 2012-11-16 15:18:14 +0000 (Fri, 16 Nov 2012)
Log Message:
-----------
OSX/scons/osl: use Xlinker for the BF_PROGRAM_LINKFLAGS, so we can alternative again compile with gcc-4.6
Modified Paths:
--------------
trunk/blender/SConstruct
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2012-11-16 15:15:40 UTC (rev 52283)
+++ trunk/blender/SConstruct 2012-11-16 15:18:14 UTC (rev 52284)
@@ -309,7 +309,7 @@
if env['WITH_BF_CYCLES_OSL'] == 1:
# this is kinda hardcoded atm due not understood path issues, also look that we need 2 variants of passing the oslexec with the force_load option, why ?
env.Append(LINKFLAGS=['-L../lib/darwin-9.x.universal/osl/lib','-loslcomp','-force_load ../lib/darwin-9.x.universal/osl/lib/liboslexec.a','-loslquery'])
- env.Append(BF_PROGRAM_LINKFLAGS=['-loslcomp','-force_load','../lib/darwin-9.x.universal/osl/lib/liboslexec.a'])
+ env.Append(BF_PROGRAM_LINKFLAGS=['-loslcomp','-Xlinker','-force_load','-Xlinker','../lib/darwin-9.x.universal/osl/lib/liboslexec.a'])
if env['WITH_BF_OPENMP'] == 1:
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
More information about the Bf-blender-cvs
mailing list