[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52256] trunk/blender: OSX/scons/osl: initial osl compiling, todo: fix shader compile and copy to bundle

[jens verwiebe]

Revision: 52256
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52256
Author:   jensverwiebe
Date:     2012-11-15 21:35:25 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
OSX/scons/osl: initial osl compiling, todo: fix shader compile and copy to bundle

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/build_files/scons/config/darwin-config.py
    trunk/blender/intern/cycles/SConscript
    trunk/blender/intern/cycles/kernel/osl/SConscript

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2012-11-15 21:32:05 UTC (rev 52255)
+++ trunk/blender/SConstruct	2012-11-15 21:35:25 UTC (rev 52256)
@@ -306,6 +306,9 @@
         else:
             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'])
+		
 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-15 21:32:05 UTC (rev 52255)
+++ trunk/blender/build_files/scons/config/darwin-config.py	2012-11-15 21:35:25 UTC (rev 52256)
@@ -276,6 +276,24 @@
 # Cycles
 WITH_BF_CYCLES = True
 
+#OSL
+
+WITH_BF_CYCLES_OSL = True
+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_LIBPATH = '${BF_OSL}/lib'
+BF_OSL_COMPILER = '${BF_OSL}/bin/oslc'
+
+WITH_BF_LLVM = True
+BF_LLVM = LIBDIR + '/llvm'
+BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc LLVMX86Info LLVMX86AsmPrinter ' + \
+    'LLVMX86Utils LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMInstCombine LLVMTransformUtils LLVMipa LLVMAnalysis LLVMExecutionEngine ' + \
+    'LLVMTarget LLVMMC LLVMCore LLVMSupport'
+BF_LLVM_LIBPATH = '${BF_LLVM}/lib'
+
 WITH_BF_OIIO = True
 BF_OIIO = LIBDIR + '/openimageio'
 BF_OIIO_INC = '${BF_OIIO}/include'

Modified: trunk/blender/intern/cycles/SConscript
===================================================================
--- trunk/blender/intern/cycles/SConscript	2012-11-15 21:32:05 UTC (rev 52255)
+++ trunk/blender/intern/cycles/SConscript	2012-11-15 21:35:25 UTC (rev 52256)
@@ -36,6 +36,7 @@
 incs.extend('#extern/glew/include #intern/mikktspace'.split())
 incs.append(cycles['BF_OIIO_INC'])
 incs.append(cycles['BF_BOOST_INC'])
+incs.append(cycles['BF_OPENEXR_INC'].split())
 incs.extend(cycles['BF_PYTHON_INC'].split())
 
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):

Modified: trunk/blender/intern/cycles/kernel/osl/SConscript
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/SConscript	2012-11-15 21:32:05 UTC (rev 52255)
+++ trunk/blender/intern/cycles/kernel/osl/SConscript	2012-11-15 21:35:25 UTC (rev 52256)
@@ -10,6 +10,7 @@
 incs += ' ' + env['BF_OIIO_INC']
 incs += ' ' + env['BF_BOOST_INC']
 incs += ' ' + env['BF_OSL_INC']
+incs += ' ' + env['BF_OPENEXR_INC']
 
 defs.append('CCL_NAMESPACE_BEGIN=namespace ccl {')
 defs.append('CCL_NAMESPACE_END=}')