OSX/scons/osl: working but not optimally designed atm
authorJens Verwiebe <info@jensverwiebe.de>
Fri, 16 Nov 2012 14:42:04 +0000 (14:42 +0000)
committerJens Verwiebe <info@jensverwiebe.de>
Fri, 16 Nov 2012 14:42:04 +0000 (14:42 +0000)
SConstruct
build_files/scons/config/darwin-config.py

index 01e83a7baccc1a15055c48beae0fb45b74ab027e..7a4b74de5aab2eec66ae509dfc54fde3af9d1842 100644 (file)
@@ -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')
index 73cd92ccb4ccaeca24f22c5959208124e0b5f504..3c051dbe2427f0e016ee872d050b092256c9190a 100644 (file)
@@ -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'