[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61391] trunk/lib/win64_vc12/ OpenImageIO/build.bat: Update script to build OIIO for windows 1.4.12

[Martijn Berger]

Revision: 61391
          https://developer.blender.org/rBL61391
Author:   juicyfruit
Date:     2014-08-01 08:42:58 +0000 (Fri, 01 Aug 2014)
Log Message:
-----------
Update script to build OIIO for windows 1.4.12

Modified Paths:
--------------
    trunk/lib/win64_vc12/OpenImageIO/build.bat

Modified: trunk/lib/win64_vc12/OpenImageIO/build.bat
===================================================================
--- trunk/lib/win64_vc12/OpenImageIO/build.bat	2014-07-31 21:17:07 UTC (rev 61390)
+++ trunk/lib/win64_vc12/OpenImageIO/build.bat	2014-08-01 08:42:58 UTC (rev 61391)
@@ -3,7 +3,7 @@
 
 set LIBDIR=%CD%\..
 set LIBNAME=OpenImageIO
-set OIIO_VERSION=1.3.12
+set OIIO_VERSION=1.4.12
 set "OIIO_SOURCE=https://github.com/OpenImageIO/oiio/archive/Release-%OIIO_VERSION%.zip"
 
 :: create build directory
@@ -33,11 +33,11 @@
 exit /b
 
 :Build
-cd %LIBDIR%\openimageio\oiio-Release-1.3.12
+cd %LIBDIR%\openimageio\oiio-Release-%OIIO_VERSION%
 mkdir build\windows
 cd build\windows
 
-cmake -G "NMake Makefiles" ..\.. ^
+cmake -G "Visual Studio 12 2013 Win64" ..\.. ^
  -DCMAKE_INSTALL_PREFIX=%LIBDIR%\openimageio ^
  -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" ^
@@ -76,10 +76,12 @@
  -DUSE_PYTHON=OFF ^
  -DOIIO_BUILD_TOOLS=OFF ^
  -DOIIO_BUILD_TESTS=OFF ^
+ -DBUILD_TESTING=OFF ^
  -DCMAKE_BUILD_TYPE=Release
 
-nmake
-nmake install
+ 
+msbuild /p:Configuration=Release /t:Rebuild  /p:Platform="x64" openimageio.sln
+msbuild /p:Configuration=Release /t:Build  /p:Platform="x64" INSTALL.vcxproj
 
 goto:eof
 
@@ -90,11 +92,11 @@
 
 
 :Build_debug
-cd %LIBDIR%\openimageio\oiio-Release-1.3.12
+cd %LIBDIR%\openimageio\oiio-Release-%OIIO_VERSION%
 mkdir build\windows-dbg
 cd build\windows-dbg
 
-cmake -G "NMake Makefiles" ..\.. ^
+cmake -G "Visual Studio 12 2013 Win64" ..\.. ^
  -DCMAKE_INSTALL_PREFIX=%LIBDIR%\openimageio ^
  -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" ^
@@ -133,11 +135,12 @@
  -DUSE_PYTHON=OFF ^
  -DOIIO_BUILD_TOOLS=OFF ^
  -DOIIO_BUILD_TESTS=OFF ^
+ -DBUILD_TESTING=OFF ^
  -DCMAKE_DEBUG_POSTFIX:STRING="_d" ^
  -DCMAKE_BUILD_TYPE=Debug
 
-nmake
-nmake install
+msbuild /p:Configuration=Debug /t:Rebuild  /p:Platform="x64" openimageio.sln
+msbuild /p:Configuration=Debug /t:Build  /p:Platform="x64" INSTALL.vcxproj
 
 goto:eof
  
@@ -167,13 +170,6 @@
     unzip oiio-Release-%OIIO_VERSION%.zip
 )
 
-if not exitst oiio-Release-%OIIO_VERSION%\.patch_done (
-    patch -i msvc_2013.patch
-    echo 1 > oiio-Release-%OIIO_VERSION%\.patch_done
-)
-
-
-
 goto:eof
 
 :CheckOS