[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52367] trunk/blender/SConstruct: OSX/ scons/osl: un-hardcode the osl libpath
jens verwiebe
info at jensverwiebe.de
Mon Nov 19 18:15:35 CET 2012
Revision: 52367
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52367
Author: jensverwiebe
Date: 2012-11-19 17:15:33 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
OSX/scons/osl: un-hardcode the osl libpath
Modified Paths:
--------------
trunk/blender/SConstruct
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2012-11-19 16:46:48 UTC (rev 52366)
+++ trunk/blender/SConstruct 2012-11-19 17:15:33 UTC (rev 52367)
@@ -306,11 +306,12 @@
else:
env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','Jackmp'])
- 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=['-Xlinker','-force_load','-Xlinker','../lib/darwin-9.x.universal/osl/lib/liboslexec.a'])
-
+ if env['WITH_BF_CYCLES_OSL'] == 1:
+ OSX_OSL_LIBPATH = Dir(env.subst(env['BF_OSL_LIBPATH'])).abspath
+ # we need 2 variants of passing the oslexec with the force_load option, string and list type atm
+ env.Append(LINKFLAGS=['-L'+OSX_OSL_LIBPATH,'-loslcomp','-force_load '+ OSX_OSL_LIBPATH +'/liboslexec.a','-loslquery'])
+ env.Append(BF_PROGRAM_LINKFLAGS=['-Xlinker','-force_load','-Xlinker',OSX_OSL_LIBPATH +'/liboslexec.a'])
+
if env['WITH_BF_OPENMP'] == 1:
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
env['CCFLAGS'].append('/openmp')
More information about the Bf-blender-cvs
mailing list