[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61492] trunk/lib/win64_vc12/osl/ build.bat: Change the build script so that is can build sergey' s branch and OpenEXR 2.2
Martijn Berger
martijn.berger at gmail.com
Tue Feb 3 22:56:55 CET 2015
Revision: 61492
https://developer.blender.org/rBL61492
Author: juicyfruit
Date: 2015-02-03 21:56:55 +0000 (Tue, 03 Feb 2015)
Log Message:
-----------
Change the build script so that is can build sergey's branch and OpenEXR 2.2
Modified Paths:
--------------
trunk/lib/win64_vc12/osl/build.bat
Modified: trunk/lib/win64_vc12/osl/build.bat
===================================================================
--- trunk/lib/win64_vc12/osl/build.bat 2015-02-03 14:19:51 UTC (rev 61491)
+++ trunk/lib/win64_vc12/osl/build.bat 2015-02-03 21:56:55 UTC (rev 61492)
@@ -19,10 +19,10 @@
call :CheckTargetArch
-if not exist OpenShadingLanguage-Release-%OIIO_VERSION% (
- echo getting source
- call :PrepareSource
-)
+:: if not exist OpenShadingLanguage-Release-%OIIO_VERSION% (
+:: echo getting source
+:: call :PrepareSource
+::)
echo Calling Build
IF [%1]==[DEBUG] (
@@ -35,21 +35,23 @@
:Build
-cd OpenShadingLanguage-Release-%OSL_VERSION%
+::cd OpenShadingLanguage-Release-%OSL_VERSION%
+cd OpenShadingLanguage-blender-fixes
:: create build directory
+rmdir /s build
mkdir build\windows
cd build\windows
-cmake -G "Visual Studio 12 2013 Win64" ..\..\ ^
+cmake -G "NMake Makefiles" ..\..\ ^
-DCMAKE_INSTALL_PREFIX=%LIBDIR%\osl ^
- -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_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_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 ^
+ -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_2.lib;%LIBDIR%\openexr\lib\IlmImf-2_2.lib;%LIBDIR%\openexr\lib\Iex-2_2.lib;%LIBDIR%\openexr\lib\IlmThread-2_2.lib ^
-DBOOST_ROOT=%LIBDIR%\boost ^
-DBoost_USE_STATIC_LIBS=ON ^
-DBoost_USE_STATIC_RUNTIME=ON ^
@@ -58,7 +60,7 @@
-DFLEX_EXECUTABLE=%LIBDIR%\osl\flex_bison\bin\win_flex.exe ^
-DBISON_EXECUTABLE=%LIBDIR%\osl\flex_bison\bin\win_bison.exe ^
-DILMBASE_CUSTOM="ON" ^
- -DILMBASE_CUSTOM_LIBRARIES="Imath-2_1 Half IlmThread-2_1 Iex-2_1" ^
+ -DILMBASE_CUSTOM_LIBRARIES="Imath-2_2 Half IlmThread-2_2 Iex-2_2" ^
-DILMBASE_CUSTOM_INCLUDE_DIR=%LIBDIR%\openexr\include ^
-DILMBASE_CUSTOM_LIB_DIR=%LIBDIR%\openexr\lib ^
-DLLVM_DIRECTORY=%LIBDIR%\llvm ^
@@ -67,11 +69,10 @@
-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 ^
+ -DILMBASE_VERSION=2_2 ^
-DCMAKE_BUILD_TYPE=Release
-msbuild /p:Configuration=Release /t:Build /p:Platform="x64" osl.sln
-msbuild /p:Configuration=Release /t:Build /p:Platform="x64" INSTALL.vcxproj
+nmake install
goto:eof
@@ -78,26 +79,28 @@
:Build_debug
-cd OpenShadingLanguage-Release-%OSL_VERSION%
+cd OpenShadingLanguage-blender-fixes
+::cd OpenShadingLanguage-Release-%OSL_VERSION%
:: create build directory
+rmdir /s build
mkdir build\windows_debug
cd build\windows_debug
-cmake -G "Visual Studio 12 2013 Win64" ..\..\ ^
+cmake -G "NMake Makefiles" ..\..\ ^
-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_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_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 ^
+ -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_2_d.lib;%LIBDIR%\openexr\lib\IlmImf-2_2_d.lib;%LIBDIR%\openexr\lib\Iex-2_2_d.lib;%LIBDIR%\openexr\lib\IlmThread-2_2_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_LIBRARIES="Imath-2_2_d Half_d IlmThread-2_2_d Iex-2_2_d" ^
-DILMBASE_CUSTOM_INCLUDE_DIR=%LIBDIR%\openexr\include ^
-DILMBASE_CUSTOM_LIB_DIR=%LIBDIR%\openexr\lib ^
-DZLIB_INCLUDE_DIR=%LIBDIR%\zlib\include ^
@@ -111,11 +114,10 @@
-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 ^
+ -DILMBASE_VERSION=2_2 ^
-DCMAKE_BUILD_TYPE=Debug
-msbuild /p:Configuration=Debug /t:Build /p:Platform="x64" osl.sln
-msbuild /p:Configuration=Debug /t:Build /p:Platform="x64" INSTALL.vcxproj
+nmake install
goto:eof
More information about the Bf-blender-cvs
mailing list