[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61403] trunk/lib/win64_vc12/osl: OSL 1.5 fix build to be msbuild / visualstudio compatible.

Martijn Berger martijn.berger at gmail.com
Mon Aug 4 16:25:20 CEST 2014 

Revision: 61403
          https://developer.blender.org/rBL61403
Author:   juicyfruit
Date:     2014-08-04 14:25:19 +0000 (Mon, 04 Aug 2014)
Log Message:
-----------
OSL 1.5 fix build to be msbuild / visualstudio compatible.
Upstreamed visual studio build fix, release libs should stay unchanged

Modified Paths:
--------------
    trunk/lib/win64_vc12/osl/build.bat
    trunk/lib/win64_vc12/osl/osl_fixes_msvc2013.diff

Modified: trunk/lib/win64_vc12/osl/build.bat
===================================================================
--- trunk/lib/win64_vc12/osl/build.bat	2014-08-02 12:53:26 UTC (rev 61402)
+++ trunk/lib/win64_vc12/osl/build.bat	2014-08-04 14:25:19 UTC (rev 61403)
@@ -70,7 +70,7 @@
  -DILMBASE_VERSION=2_1 ^
  -DCMAKE_BUILD_TYPE=Release
 
-msbuild /p:Configuration=Release /t:Rebuild  /p:Platform="x64" OpenShadingLanguage.sln
+msbuild /p:Configuration=Release /t:Build  /p:Platform="x64" osl.sln
 msbuild /p:Configuration=Release /t:Build  /p:Platform="x64" INSTALL.vcxproj
 
 goto:eof
@@ -84,18 +84,22 @@
 cd build\windows_debug
 
 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_INSTALL_PREFIX=%LIBDIR%\osl\debug ^
+ -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_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 ^
+ -DOPENIMAGEIO_LIBRARY=%LIBDIR%\openimageio\lib\OpenImageIO_d.lib;%LIBDIR%\openimageio\lib\OpenImageIO_Util_d.lib;%LIBDIR%\png\lib\libpng.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 ^
+ -DILMBASE_CUSTOM="ON" ^
+ -DILMBASE_CUSTOM_LIBRARIES="Imath-2_1_d Half_d IlmThread-2_1_d Iex-2_1_d" ^
+ -DILMBASE_CUSTOM_INCLUDE_DIR=%LIBDIR%\openexr\include ^
+ -DILMBASE_CUSTOM_LIB_DIR=%LIBDIR%\openexr\lib ^
  -DZLIB_INCLUDE_DIR=%LIBDIR%\zlib\include ^
  -DZLIB_LIBRARY=%LIBDIR%\zlib\lib\libz_st.lib ^
  -DFLEX_EXECUTABLE=%LIBDIR%\osl\flex_bison\bin\win_flex.exe ^
@@ -104,13 +108,13 @@
  -DLLVM_INCLUDES=%LIBDIR%\llvm\include ^
  -DLLVM_LIB_DIR=%LIBDIR%\llvm\debug\lib ^
  -DLLVM_VERSION=3.4 ^
-  -DCMAKE_DEBUG_POSTFIX:STRING="_d" ^
+ -DCMAKE_DEBUG_POSTFIX:STRING="_d" ^
  -DLLVM_LIBRARY=%LIBDIR%\llvm\debug\lib\LLVMAnalysis.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\lib\LLVMSupport.lib;%LIBDIR%\llvm\debug\l
 ib\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 ^
  -DILMBASE_HOME=%LIBDIR%\openexr ^
  -DILMBASE_VERSION=2_1 ^
  -DCMAKE_BUILD_TYPE=Debug
 
-msbuild /p:Configuration=Debug /t:Rebuild  /p:Platform="x64" OSL.sln
+msbuild /p:Configuration=Debug /t:Build  /p:Platform="x64" osl.sln
 msbuild /p:Configuration=Debug /t:Build  /p:Platform="x64" INSTALL.vcxproj
 
 goto:eof
@@ -140,6 +144,9 @@
 if not exist OpenShadingLanguage-Release-%OSL_VERSION% (
     echo Extraction source to OSL-%OSL_VERSION%
     unzip OpenShadingLanguage-Release-%OSL_VERSION%.zip
+	cd OpenShadingLanguage-Release-%OSL_VERSION%
+	patch -p1 < ..\osl_fixes_msvc2013.diff
+	cd ..
 )
 goto:eof
 

Modified: trunk/lib/win64_vc12/osl/osl_fixes_msvc2013.diff
===================================================================
--- trunk/lib/win64_vc12/osl/osl_fixes_msvc2013.diff	2014-08-02 12:53:26 UTC (rev 61402)
+++ trunk/lib/win64_vc12/osl/osl_fixes_msvc2013.diff	2014-08-04 14:25:19 UTC (rev 61403)
@@ -42,3 +42,19 @@
  using OIIO::expm1;
  #endif
  
+--- OpenShadingLanguage-Release-1.5.10.orig/src/shaders/CMakeLists.txt	Wed Jul 30 19:38:26 2014
++++ OpenShadingLanguage-Release-1.5.10/src/shaders/CMakeLists.txt	Mon Aug  4 15:55:45 2014
+@@ -3,6 +3,12 @@
+     MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/stdosl.h"
+     WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+ 
++if(${CMAKE_GENERATOR} MATCHES "(Visual Studio.*)") #Work around visual studio outputting oslc.exe in a subfolder
++	add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/../oslc/oslc"
++		COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/../oslc/${CMAKE_BUILD_TYPE}/oslc.exe" "${CMAKE_CURRENT_BINARY_DIR}/../oslc/"
++		DEPENDS oslc)
++endif()		
++	
+ macro (osl_compile oslsrc objlist headers)
+     # message (STATUS "OSL_COMPILE src=${oslsrc}")
+     # message (STATUS "  src ${CMAKE_CURRENT_SOURCE_DIR}")
+

More information about the Bf-blender-cvs mailing list