diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-16 18:42:04 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-16 18:42:04 +0400 |
| commit | d017f34c5dda6f0940c0ba13271113881b7108b5 (patch) | |
| tree | b1f91594c276f195f391d0aca6be7b5163e3b923 /SConstruct | |
| parent | dc06523622e90ce236bf7bf32bebb45968bc51ae (diff) | |
OSX/scons/osl: working but not optimally designed atm
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 6 |
1 files changed, 4 insertions, 2 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') |