[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52280] trunk/blender: OSX/scons/osl: working but not optimally designed atm

[jens verwiebe]

Revision: 52280
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52280
Author:   jensverwiebe
Date:     2012-11-16 14:42:04 +0000 (Fri, 16 Nov 2012)
Log Message:
-----------
OSX/scons/osl: working but not optimally designed atm

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/build_files/scons/config/darwin-config.py

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2012-11-16 14:28:37 UTC (rev 52279)
+++ trunk/blender/SConstruct	2012-11-16 14:42:04 UTC (rev 52280)
@@ -307,8 +307,10 @@
             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 /Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/osl/lib/liboslexec.a','-loslquery'])
+        env.Append(BF_PROGRAM_LINKFLAGS=['-loslcomp','-force_load','/Volumes/Workdata/Blender/Development/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')

Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py	2012-11-16 14:28:37 UTC (rev 52279)
+++ trunk/blender/build_files/scons/config/darwin-config.py	2012-11-16 14:42:04 UTC (rev 52280)
@@ -283,7 +283,7 @@
 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'