[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52358] trunk/blender: SCons: make OSL linking work on windows, and fix OSL compiler path issue to

[Brecht Van Lommel]

Revision: 52358
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52358
Author:   blendix
Date:     2012-11-19 14:54:35 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
SCons: make OSL linking work on windows, and fix OSL compiler path issue to
properly expand to absolute path.

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/win32-vc-config.py
    trunk/blender/build_files/scons/config/win64-vc-config.py
    trunk/blender/intern/cycles/kernel/shaders/SConscript

Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py	2012-11-19 14:40:39 UTC (rev 52357)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py	2012-11-19 14:54:35 UTC (rev 52358)
@@ -150,28 +150,34 @@
 #Cycles
 WITH_BF_CYCLES = True 
 
-#OSL
 WITH_BF_CYCLES_OSL = False
 WITH_BF_STATICOSL = True
-BF_OSL = LIBDIR + '/osl'
+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 oslexec oslquery'
 BF_OSL_LIBPATH = '${BF_OSL}/lib'
+BF_OSL_LIB_STATIC = '${BF_OSL_LIBPATH}/oslcomp.lib ${BF_OSL_LIBPATH}/oslexec.lib ${BF_OSL_LIBPATH}/oslquery.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'
-BF_OIIO_LIB = 'OpenImageIO'
 BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
+BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/OpenImageIO.lib'
+WITH_BF_STATICOIIO = True
 
 WITH_BF_OCIO = True
 BF_OCIO = '${LIBDIR}/opencolorio'
 BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB = 'OpenColorIO'
 BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
+BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/OpenColorIO.lib'
+WITH_BF_STATICOCIO = True
 
 WITH_BF_BOOST = True
 BF_BOOST = '${LIBDIR}/boost'

Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py	2012-11-19 14:40:39 UTC (rev 52357)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py	2012-11-19 14:54:35 UTC (rev 52358)
@@ -146,28 +146,34 @@
 #Cycles
 WITH_BF_CYCLES = True
 
-#OSL
 WITH_BF_CYCLES_OSL = False
 WITH_BF_STATICOSL = True
-BF_OSL = LIBDIR + '/osl'
+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 oslexec oslquery'
 BF_OSL_LIBPATH = '${BF_OSL}/lib'
+BF_OSL_LIB_STATIC = '${BF_OSL_LIBPATH}/oslcomp.lib ${BF_OSL_LIBPATH}/oslexec.lib ${BF_OSL_LIBPATH}/oslquery.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'
-BF_OIIO_LIB = 'OpenImageIO'
 BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
+BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/OpenImageIO.lib'
+WITH_BF_STATICOIIO = True
 
 WITH_BF_OCIO = True
 BF_OCIO = '${LIBDIR}/opencolorio'
 BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB = 'OpenColorIO'
 BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
+BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/OpenColorIO.lib'
+WITH_BF_STATICOCIO = True
 
 WITH_BF_BOOST = True
 BF_BOOST = '${LIBDIR}/boost'

Modified: trunk/blender/intern/cycles/kernel/shaders/SConscript
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/SConscript	2012-11-19 14:40:39 UTC (rev 52357)
+++ trunk/blender/intern/cycles/kernel/shaders/SConscript	2012-11-19 14:54:35 UTC (rev 52358)
@@ -13,11 +13,8 @@
 if env['WITH_BF_CYCLES_OSL']:
     shaders = env.Clone()
 
-    # osl compiler info
-    if env['OURPLATFORM']=='darwin':
-        osl_compiler = env['LCGDIR'][1:] + '/osl/bin/oslc' # get the leading "#" away that breaks shadercompile
-    else:
-        osl_compiler = env['BF_OSL_COMPILER']
+    # osl compiler
+    osl_compiler = env._canonicalize(env.subst(env['BF_OSL_COMPILER']))
 
     # build directory
     root_build_dir = normpath(env['BF_BUILDDIR'])