[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61393] trunk/lib/win64_vc12/osl: OSL 1.5 win64 msvc2013
Martijn Berger
martijn.berger at gmail.com
Fri Aug 1 12:09:37 CEST 2014
Revision: 61393
https://developer.blender.org/rBL61393
Author: juicyfruit
Date: 2014-08-01 10:09:35 +0000 (Fri, 01 Aug 2014)
Log Message:
-----------
OSL 1.5 win64 msvc2013
Modified Paths:
--------------
trunk/lib/win64_vc12/osl/build.bat
Added Paths:
-----------
trunk/lib/win64_vc12/osl/bin/
trunk/lib/win64_vc12/osl/bin/oslc.exe
trunk/lib/win64_vc12/osl/bin/oslinfo.exe
trunk/lib/win64_vc12/osl/bin/testrender.exe
trunk/lib/win64_vc12/osl/bin/testshade.exe
trunk/lib/win64_vc12/osl/bin/testshade_dso.exe
trunk/lib/win64_vc12/osl/include/
trunk/lib/win64_vc12/osl/include/OSL/
trunk/lib/win64_vc12/osl/include/OSL/Imathx.h
trunk/lib/win64_vc12/osl/include/OSL/accum.h
trunk/lib/win64_vc12/osl/include/OSL/dual.h
trunk/lib/win64_vc12/osl/include/OSL/dual_vec.h
trunk/lib/win64_vc12/osl/include/OSL/export.h
trunk/lib/win64_vc12/osl/include/OSL/genclosure.h
trunk/lib/win64_vc12/osl/include/OSL/llvm_util.h
trunk/lib/win64_vc12/osl/include/OSL/matrix22.h
trunk/lib/win64_vc12/osl/include/OSL/optautomata.h
trunk/lib/win64_vc12/osl/include/OSL/oslclosure.h
trunk/lib/win64_vc12/osl/include/OSL/oslcomp.h
trunk/lib/win64_vc12/osl/include/OSL/oslconfig.h
trunk/lib/win64_vc12/osl/include/OSL/oslexec.h
trunk/lib/win64_vc12/osl/include/OSL/oslquery.h
trunk/lib/win64_vc12/osl/include/OSL/oslversion.h
trunk/lib/win64_vc12/osl/include/OSL/rendererservices.h
trunk/lib/win64_vc12/osl/include/OSL/shaderglobals.h
trunk/lib/win64_vc12/osl/lib/
trunk/lib/win64_vc12/osl/lib/libtestshade.lib
trunk/lib/win64_vc12/osl/lib/oslcomp.lib
trunk/lib/win64_vc12/osl/lib/oslexec.lib
trunk/lib/win64_vc12/osl/lib/oslquery.lib
trunk/lib/win64_vc12/osl/osl_fixes_msvc2013.diff
trunk/lib/win64_vc12/osl/shaders/
trunk/lib/win64_vc12/osl/shaders/emitter.osl
trunk/lib/win64_vc12/osl/shaders/emitter.oso
trunk/lib/win64_vc12/osl/shaders/glass.osl
trunk/lib/win64_vc12/osl/shaders/glass.oso
trunk/lib/win64_vc12/osl/shaders/image.osl
trunk/lib/win64_vc12/osl/shaders/image.oso
trunk/lib/win64_vc12/osl/shaders/matte.osl
trunk/lib/win64_vc12/osl/shaders/matte.oso
trunk/lib/win64_vc12/osl/shaders/metal.osl
trunk/lib/win64_vc12/osl/shaders/metal.oso
trunk/lib/win64_vc12/osl/shaders/oslutil.h
trunk/lib/win64_vc12/osl/shaders/stdosl.h
trunk/lib/win64_vc12/osl/shaders/ubersurface.osl
trunk/lib/win64_vc12/osl/shaders/ubersurface.oso
Removed Paths:
-------------
trunk/lib/win64_vc12/osl/bin/
trunk/lib/win64_vc12/osl/build.patch
trunk/lib/win64_vc12/osl/include/
trunk/lib/win64_vc12/osl/lib/
trunk/lib/win64_vc12/osl/shaders/
Added: trunk/lib/win64_vc12/osl/bin/oslc.exe
===================================================================
(Binary files differ)
Index: trunk/lib/win64_vc12/osl/bin/oslc.exe
===================================================================
--- trunk/lib/win64_vc12/osl/bin/oslc.exe 2014-08-01 10:02:19 UTC (rev 61392)
+++ trunk/lib/win64_vc12/osl/bin/oslc.exe 2014-08-01 10:09:35 UTC (rev 61393)
Property changes on: trunk/lib/win64_vc12/osl/bin/oslc.exe
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/lib/win64_vc12/osl/bin/oslinfo.exe
===================================================================
(Binary files differ)
Index: trunk/lib/win64_vc12/osl/bin/oslinfo.exe
===================================================================
--- trunk/lib/win64_vc12/osl/bin/oslinfo.exe 2014-08-01 10:02:19 UTC (rev 61392)
+++ trunk/lib/win64_vc12/osl/bin/oslinfo.exe 2014-08-01 10:09:35 UTC (rev 61393)
Property changes on: trunk/lib/win64_vc12/osl/bin/oslinfo.exe
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/lib/win64_vc12/osl/bin/testrender.exe
===================================================================
(Binary files differ)
Index: trunk/lib/win64_vc12/osl/bin/testrender.exe
===================================================================
--- trunk/lib/win64_vc12/osl/bin/testrender.exe 2014-08-01 10:02:19 UTC (rev 61392)
+++ trunk/lib/win64_vc12/osl/bin/testrender.exe 2014-08-01 10:09:35 UTC (rev 61393)
Property changes on: trunk/lib/win64_vc12/osl/bin/testrender.exe
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/lib/win64_vc12/osl/bin/testshade.exe
===================================================================
(Binary files differ)
Index: trunk/lib/win64_vc12/osl/bin/testshade.exe
===================================================================
--- trunk/lib/win64_vc12/osl/bin/testshade.exe 2014-08-01 10:02:19 UTC (rev 61392)
+++ trunk/lib/win64_vc12/osl/bin/testshade.exe 2014-08-01 10:09:35 UTC (rev 61393)
Property changes on: trunk/lib/win64_vc12/osl/bin/testshade.exe
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/lib/win64_vc12/osl/bin/testshade_dso.exe
===================================================================
(Binary files differ)
Index: trunk/lib/win64_vc12/osl/bin/testshade_dso.exe
===================================================================
--- trunk/lib/win64_vc12/osl/bin/testshade_dso.exe 2014-08-01 10:02:19 UTC (rev 61392)
+++ trunk/lib/win64_vc12/osl/bin/testshade_dso.exe 2014-08-01 10:09:35 UTC (rev 61393)
Property changes on: trunk/lib/win64_vc12/osl/bin/testshade_dso.exe
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/lib/win64_vc12/osl/build.bat
===================================================================
--- trunk/lib/win64_vc12/osl/build.bat 2014-08-01 10:02:19 UTC (rev 61392)
+++ trunk/lib/win64_vc12/osl/build.bat 2014-08-01 10:09:35 UTC (rev 61393)
@@ -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
@@ -40,16 +40,16 @@
mkdir build\windows
cd build\windows
-cmake -G "NMake Makefiles" ..\..\ ^
+cmake -G "Visual Studio 12 2013 Win64" ..\..\ ^
-DCMAKE_INSTALL_PREFIX=%LIBDIR%\osl ^
- -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_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /DPSAPI_VERSION=1 /RTC1 /DOIIO_STATIC_BUILD" ^
+ -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD" ^
+ -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD" ^
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD" ^
-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 ^
@@ -64,13 +64,14 @@
-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
-nmake install
+msbuild /p:Configuration=Release /t:Rebuild /p:Platform="x64" OpenShadingLanguage.sln
+msbuild /p:Configuration=Release /t:Build /p:Platform="x64" INSTALL.vcxproj
goto:eof
@@ -82,7 +83,7 @@
mkdir build\windows_debug
cd build\windows_debug
-cmake -G "NMake Makefiles" ..\..\ ^
+cmake -G "Visual Studio 12 2013 Win64" ..\..\ ^
-DCMAKE_INSTALL_PREFIX=%LIBDIR%\osl ^
-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" ^
@@ -91,7 +92,7 @@
-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 ^
@@ -102,14 +103,15 @@
-DLLVM_DIRECTORY=%LIBDIR%\llvm ^
-DLLVM_INCLUDES=%LIBDIR%\llvm\include ^
-DLLVM_LIB_DIR=%LIBDIR%\llvm\debug\lib ^
- -DLLVM_VERSION=3.2 ^
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list