diff options
| -rw-r--r-- | SConstruct | 6 | ||||
| -rw-r--r-- | build_files/scons/config/darwin-config.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 01e83a7bacc..7a4b74de5aa 100644 --- a/SConstruct +++ b/SConstruct @@ -307,8 +307,10 @@ if env['OURPLATFORM']=='darwin': env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','Jackmp']) if env['WITH_BF_CYCLES_OSL'] == 1: - env.Append(LINKFLAGS=['-force_load','../lib/darwin-9.x.universal/osl/lib/liboslexec.a']) - + # 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']) + if env['WITH_BF_OPENMP'] == 1: if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): env['CCFLAGS'].append('/openmp') diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 73cd92ccb4c..3c051dbe242 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -283,7 +283,7 @@ BF_OSL = LIBDIR + '/osl' BF_OSL_INC = '${BF_OSL}/include' # note oslexec would passed via program linkflags, which is needed to # make llvm happy with osl_allocate_closure_component -BF_OSL_LIB = 'oslcomp oslquery' +#BF_OSL_LIB = 'oslcomp oslquery' BF_OSL_LIBPATH = '${BF_OSL}/lib' BF_OSL_COMPILER = '${BF_OSL}/bin/oslc' |