Skip to content
Snippets Groups Projects
Commit efe012ee authored by Jens Verwiebe's avatar Jens Verwiebe
Browse files

OSX/scons/osl: un-hardcode the osl libpath

parent d3960ee3
Branches
No related tags found
No related merge requests found
...@@ -307,9 +307,10 @@ if env['OURPLATFORM']=='darwin': ...@@ -307,9 +307,10 @@ if env['OURPLATFORM']=='darwin':
env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','Jackmp']) env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','Jackmp'])
if env['WITH_BF_CYCLES_OSL'] == 1: 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 ? OSX_OSL_LIBPATH = Dir(env.subst(env['BF_OSL_LIBPATH'])).abspath
env.Append(LINKFLAGS=['-L../lib/darwin-9.x.universal/osl/lib','-loslcomp','-force_load ../lib/darwin-9.x.universal/osl/lib/liboslexec.a','-loslquery']) # we need 2 variants of passing the oslexec with the force_load option, string and list type atm
env.Append(BF_PROGRAM_LINKFLAGS=['-Xlinker','-force_load','-Xlinker','../lib/darwin-9.x.universal/osl/lib/liboslexec.a']) 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['WITH_BF_OPENMP'] == 1:
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment