[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61399] trunk/lib/windows_vc12/osl: OSL 1.5 windows x86 msvc 2013

Martijn Berger martijn.berger at gmail.com
Sat Aug 2 09:50:28 CEST 2014


Revision: 61399
          https://developer.blender.org/rBL61399
Author:   juicyfruit
Date:     2014-08-02 07:50:27 +0000 (Sat, 02 Aug 2014)
Log Message:
-----------
OSL 1.5 windows x86 msvc 2013

Modified Paths:
--------------
    trunk/lib/windows_vc12/osl/build.bat

Added Paths:
-----------
    trunk/lib/windows_vc12/osl/include/
    trunk/lib/windows_vc12/osl/include/OSL/
    trunk/lib/windows_vc12/osl/include/OSL/llvm_util.h
    trunk/lib/windows_vc12/osl/include/OSL/rendererservices.h
    trunk/lib/windows_vc12/osl/include/OSL/shaderglobals.h

Removed Paths:
-------------
    trunk/lib/windows_vc12/osl/bin/
    trunk/lib/windows_vc12/osl/include/
    trunk/lib/windows_vc12/osl/lib/
    trunk/lib/windows_vc12/osl/shaders/

Modified: trunk/lib/windows_vc12/osl/build.bat
===================================================================
--- trunk/lib/windows_vc12/osl/build.bat	2014-08-02 07:25:49 UTC (rev 61398)
+++ trunk/lib/windows_vc12/osl/build.bat	2014-08-02 07:50:27 UTC (rev 61399)
@@ -3,7 +3,7 @@
 
 set LIBDIR=%CD%\..
 set LIBNAME=osl
-set OSL_VERSION=1.4.1
+set OSL_VERSION=1.5.10
 set "OSL_SOURCE=https://github.com/imageworks/OpenShadingLanguage/archive/Release-%OSL_VERSION%.zip"
 
 :: create build directory
@@ -25,7 +25,11 @@
 )
 
 echo Calling Build
+IF [%1]==[DEBUG] (
+call :Build_debug
+) ELSE (
 call :Build
+)
 
 exit /b
 
@@ -38,14 +42,14 @@
 
 cmake -G "NMake Makefiles" ..\..\ ^
  -DCMAKE_INSTALL_PREFIX=%LIBDIR%\osl ^
- -DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1" ^
- -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /D NDEBUG" ^
- -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /D NDEBUG" ^
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /D NDEBUG" ^
+ -DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /DPSAPI_VERSION=1 /RTC1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS" ^
+ -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS" ^
+ -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS" ^
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS" ^
  -DCMAKE_CXX_STANDARD_LIBRARIES:STRING="kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib psapi.lib" ^
  -DBUILDSTATIC=ON ^
  -DOPENIMAGEIOHOME=%LIBDIR%\OpenImageIO ^
- -DOPENIMAGEIO_LIBRARY=%LIBDIR%\openimageio\lib\OpenImageIO.lib;%LIBDIR%\png\lib\libpng.lib;%LIBDIR%\jpeg\lib\libjpeg.lib;%LIBDIR%\tiff\lib\libtiff.lib;%LIBDIR%\openexr\lib\Half.lib;%LIBDIR%\openexr\lib\Imath-2_1.lib;%LIBDIR%\openexr\lib\IlmImf-2_1.lib;%LIBDIR%\openexr\lib\Iex-2_1.lib;%LIBDIR%\openexr\lib\IlmThread-2_1.lib ^
+ -DOPENIMAGEIO_LIBRARY=%LIBDIR%\openimageio\lib\OpenImageIO_Util.lib;%LIBDIR%\openimageio\lib\OpenImageIO.lib;%LIBDIR%\png\lib\libpng.lib;%LIBDIR%\jpeg\lib\libjpeg.lib;%LIBDIR%\tiff\lib\libtiff.lib;%LIBDIR%\openexr\lib\Half.lib;%LIBDIR%\openexr\lib\Imath-2_1.lib;%LIBDIR%\openexr\lib\IlmImf-2_1.lib;%LIBDIR%\openexr\lib\Iex-2_1.lib;%LIBDIR%\openexr\lib\IlmThread-2_1.lib ^
  -DBOOST_ROOT=%LIBDIR%\boost ^
  -DBoost_USE_STATIC_LIBS=ON ^
  -DBoost_USE_STATIC_RUNTIME=ON ^
@@ -60,8 +64,8 @@
  -DLLVM_DIRECTORY=%LIBDIR%\llvm ^
  -DLLVM_INCLUDES=%LIBDIR%\llvm\include ^
  -DLLVM_LIB_DIR=%LIBDIR%\llvm\lib ^
- -DLLVM_VERSION=3.2 ^
- -DLLVM_LIBRARY=%LIBDIR%\llvm\lib\LLVMAnalysis.lib;%LIBDIR%\llvm\lib\LLVMArchive.lib;%LIBDIR%\llvm\lib\LLVMAsmParser.lib;%LIBDIR%\llvm\lib\LLVMAsmPrinter.lib;%LIBDIR%\llvm\lib\LLVMBitReader.lib;%LIBDIR%\llvm\lib\LLVMBitWriter.lib;%LIBDIR%\llvm\lib\LLVMCodeGen.lib;%LIBDIR%\llvm\lib\LLVMCore.lib;%LIBDIR%\llvm\lib\LLVMDebugInfo.lib;%LIBDIR%\llvm\lib\LLVMExecutionEngine.lib;%LIBDIR%\llvm\lib\LLVMInstCombine.lib;%LIBDIR%\llvm\lib\LLVMInstrumentation.lib;%LIBDIR%\llvm\lib\LLVMInterpreter.lib;%LIBDIR%\llvm\lib\LLVMJIT.lib;%LIBDIR%\llvm\lib\LLVMLinker.lib;%LIBDIR%\llvm\lib\LLVMMC.lib;%LIBDIR%\llvm\lib\LLVMMCDisassembler.lib;%LIBDIR%\llvm\lib\LLVMMCJIT.lib;%LIBDIR%\llvm\lib\LLVMMCParser.lib;%LIBDIR%\llvm\lib\LLVMObject.lib;%LIBDIR%\llvm\lib\LLVMRuntimeDyld.lib;%LIBDIR%\llvm\lib\LLVMScalarOpts.lib;%LIBDIR%\llvm\lib\LLVMSelectionDAG.lib;%LIBDIR%\llvm\lib\LLVMSupport.lib;%LIBDIR%\llvm\lib\LLVMTableGen.lib;%LIBDIR%\llvm\lib\LLVMTarget.lib;%LIBDIR%\llvm\lib\LLVMTransformUtils.lib;%LIBDIR%\llvm\li
 b\LLVMVectorize.lib;%LIBDIR%\llvm\lib\LLVMX86AsmParser.lib;%LIBDIR%\llvm\lib\LLVMX86AsmPrinter.lib;%LIBDIR%\llvm\lib\LLVMX86CodeGen.lib;%LIBDIR%\llvm\lib\LLVMX86Desc.lib;%LIBDIR%\llvm\lib\LLVMX86Disassembler.lib;%LIBDIR%\llvm\lib\LLVMX86Info.lib;%LIBDIR%\llvm\lib\LLVMX86Utils.lib;%LIBDIR%\llvm\lib\LLVMipa.lib;%LIBDIR%\llvm\lib\LLVMipo.lib ^
+ -DLLVM_VERSION=3.4 ^
+ -DLLVM_LIBRARY=%LIBDIR%\llvm\lib\LLVMAnalysis.lib;%LIBDIR%\llvm\lib\LLVMAsmParser.lib;%LIBDIR%\llvm\lib\LLVMAsmPrinter.lib;%LIBDIR%\llvm\lib\LLVMBitReader.lib;%LIBDIR%\llvm\lib\LLVMBitWriter.lib;%LIBDIR%\llvm\lib\LLVMCodeGen.lib;%LIBDIR%\llvm\lib\LLVMCore.lib;%LIBDIR%\llvm\lib\LLVMDebugInfo.lib;%LIBDIR%\llvm\lib\LLVMExecutionEngine.lib;%LIBDIR%\llvm\lib\LLVMInstCombine.lib;%LIBDIR%\llvm\lib\LLVMInstrumentation.lib;%LIBDIR%\llvm\lib\LLVMInterpreter.lib;%LIBDIR%\llvm\lib\LLVMJIT.lib;%LIBDIR%\llvm\lib\LLVMLinker.lib;%LIBDIR%\llvm\lib\LLVMMC.lib;%LIBDIR%\llvm\lib\LLVMMCDisassembler.lib;%LIBDIR%\llvm\lib\LLVMMCJIT.lib;%LIBDIR%\llvm\lib\LLVMMCParser.lib;%LIBDIR%\llvm\lib\LLVMObject.lib;%LIBDIR%\llvm\lib\LLVMRuntimeDyld.lib;%LIBDIR%\llvm\lib\LLVMScalarOpts.lib;%LIBDIR%\llvm\lib\LLVMSelectionDAG.lib;%LIBDIR%\llvm\lib\LLVMSupport.lib;%LIBDIR%\llvm\lib\LLVMTableGen.lib;%LIBDIR%\llvm\lib\LLVMTarget.lib;%LIBDIR%\llvm\lib\LLVMTransformUtils.lib;%LIBDIR%\llvm\lib\LLVMVectorize.lib;%LIBDIR%\llvm\
 lib\LLVMX86AsmParser.lib;%LIBDIR%\llvm\lib\LLVMX86AsmPrinter.lib;%LIBDIR%\llvm\lib\LLVMX86CodeGen.lib;%LIBDIR%\llvm\lib\LLVMX86Desc.lib;%LIBDIR%\llvm\lib\LLVMX86Disassembler.lib;%LIBDIR%\llvm\lib\LLVMX86Info.lib;%LIBDIR%\llvm\lib\LLVMX86Utils.lib;%LIBDIR%\llvm\lib\LLVMipa.lib;%LIBDIR%\llvm\lib\LLVMipo.lib ^
  -DILMBASE_HOME=%LIBDIR%\openexr ^
  -DILMBASE_VERSION=2_1 ^
  -DCMAKE_BUILD_TYPE=Release
@@ -80,14 +84,14 @@
 
 cmake -G "NMake Makefiles" ..\..\ ^
  -DCMAKE_INSTALL_PREFIX=%LIBDIR%\osl ^
- -DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1" ^
- -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /D NDEBUG" ^
- -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /D NDEBUG" ^
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /D NDEBUG" ^
+ -DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /DPSAPI_VERSION=1 /RTC1" ^
+ -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /DPSAPI_VERSION=1 /D NDEBUG" ^
+ -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DPSAPI_VERSION=1 /D NDEBUG" ^
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DPSAPI_VERSION=1 /D NDEBUG" ^
  -DCMAKE_CXX_STANDARD_LIBRARIES:STRING="kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib psapi.lib" ^
  -DBUILDSTATIC=ON ^
  -DOPENIMAGEIOHOME=%LIBDIR%\OpenImageIO ^
- -DOPENIMAGEIO_LIBRARY=%LIBDIR%\openimageio\lib\OpenImageIO_d.lib;%LIBDIR%\png\lib\libpng16.lib;%LIBDIR%\jpeg\lib\libjpeg.lib;%LIBDIR%\tiff\lib\libtiff.lib;%LIBDIR%\openexr\lib\Half_d.lib;%LIBDIR%\openexr\lib\Imath-2_1_d.lib;%LIBDIR%\openexr\lib\IlmImf-2_1_d.lib;%LIBDIR%\openexr\lib\Iex-2_1_d.lib;%LIBDIR%\openexr\lib\IlmThread-2_1_d.lib ^
+ -DOPENIMAGEIO_LIBRARY=%LIBDIR%\openimageio\lib\OpenImageIO_d.lib;%LIBDIR%\openimageio\lib\OpenImageIO_Util_d.lib;%LIBDIR%\png\lib\libpng16.lib;%LIBDIR%\jpeg\lib\libjpeg.lib;%LIBDIR%\tiff\lib\libtiff.lib;%LIBDIR%\openexr\lib\Half_d.lib;%LIBDIR%\openexr\lib\Imath-2_1_d.lib;%LIBDIR%\openexr\lib\IlmImf-2_1_d.lib;%LIBDIR%\openexr\lib\Iex-2_1_d.lib;%LIBDIR%\openexr\lib\IlmThread-2_1_d.lib ^
  -DBOOST_ROOT=%LIBDIR%\boost ^
  -DBoost_USE_STATIC_LIBS=ON ^
  -DBoost_USE_STATIC_RUNTIME=ON ^
@@ -98,9 +102,9 @@
  -DLLVM_DIRECTORY=%LIBDIR%\llvm ^
  -DLLVM_INCLUDES=%LIBDIR%\llvm\include ^
  -DLLVM_LIB_DIR=%LIBDIR%\llvm\debug\lib ^
- -DLLVM_VERSION=3.2 ^
+ -DLLVM_VERSION=3.4 ^
   -DCMAKE_DEBUG_POSTFIX:STRING="_d" ^
- -DLLVM_LIBRARY=%LIBDIR%\llvm\debug\lib\LLVMAnalysis.lib;%LIBDIR%\llvm\debug\lib\LLVMArchive.lib;%LIBDIR%\llvm\debug\lib\LLVMAsmParser.lib;%LIBDIR%\llvm\debug\lib\LLVMAsmPrinter.lib;%LIBDIR%\llvm\debug\lib\LLVMBitReader.lib;%LIBDIR%\llvm\debug\lib\LLVMBitWriter.lib;%LIBDIR%\llvm\debug\lib\LLVMCodeGen.lib;%LIBDIR%\llvm\debug\lib\LLVMCore.lib;%LIBDIR%\llvm\debug\lib\LLVMDebugInfo.lib;%LIBDIR%\llvm\debug\lib\LLVMExecutionEngine.lib;%LIBDIR%\llvm\debug\lib\LLVMInstCombine.lib;%LIBDIR%\llvm\debug\lib\LLVMInstrumentation.lib;%LIBDIR%\llvm\debug\lib\LLVMInterpreter.lib;%LIBDIR%\llvm\debug\lib\LLVMJIT.lib;%LIBDIR%\llvm\debug\lib\LLVMLinker.lib;%LIBDIR%\llvm\debug\lib\LLVMMC.lib;%LIBDIR%\llvm\debug\lib\LLVMMCDisassembler.lib;%LIBDIR%\llvm\debug\lib\LLVMMCJIT.lib;%LIBDIR%\llvm\debug\lib\LLVMMCParser.lib;%LIBDIR%\llvm\debug\lib\LLVMObject.lib;%LIBDIR%\llvm\debug\lib\LLVMRuntimeDyld.lib;%LIBDIR%\llvm\debug\lib\LLVMScalarOpts.lib;%LIBDIR%\llvm\debug\lib\LLVMSelectionDAG.lib;%LIBDIR%\llvm\debug\l
 ib\LLVMSupport.lib;%LIBDIR%\llvm\debug\lib\LLVMTableGen.lib;%LIBDIR%\llvm\debug\lib\LLVMTarget.lib;%LIBDIR%\llvm\debug\lib\LLVMTransformUtils.lib;%LIBDIR%\llvm\debug\lib\LLVMVectorize.lib;%LIBDIR%\llvm\debug\lib\LLVMX86AsmParser.lib;%LIBDIR%\llvm\debug\lib\LLVMX86AsmPrinter.lib;%LIBDIR%\llvm\debug\lib\LLVMX86CodeGen.lib;%LIBDIR%\llvm\debug\lib\LLVMX86Desc.lib;%LIBDIR%\llvm\debug\lib\LLVMX86Disassembler.lib;%LIBDIR%\llvm\debug\lib\LLVMX86Info.lib;%LIBDIR%\llvm\debug\lib\LLVMX86Utils.lib;%LIBDIR%\llvm\debug\lib\LLVMipa.lib;%LIBDIR%\llvm\debug\lib\LLVMipo.lib ^

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list