[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61631] trunk/lib/win64_vc12/osl: MSVC 2013 windows x64 (vc120) OSL 1.7.1

Martijn Berger martijn.berger at gmail.com
Thu Feb 11 13:20:38 CET 2016 

Revision: 61631
          https://developer.blender.org/rBL61631
Author:   juicyfruit
Date:     2016-02-11 12:20:36 +0000 (Thu, 11 Feb 2016)
Log Message:
-----------
MSVC 2013 windows x64 (vc120)  OSL 1.7.1

Modified Paths:
--------------
    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/build.bat
    trunk/lib/win64_vc12/osl/flex_bison/bin/data/c.m4
    trunk/lib/win64_vc12/osl/flex_bison/bin/win_bison.exe
    trunk/lib/win64_vc12/osl/flex_bison/bin/win_flex.exe
    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/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/lib/oslcomp.lib
    trunk/lib/win64_vc12/osl/lib/oslcomp_d.lib
    trunk/lib/win64_vc12/osl/lib/oslexec.lib
    trunk/lib/win64_vc12/osl/lib/oslexec_d.lib
    trunk/lib/win64_vc12/osl/lib/oslquery.lib
    trunk/lib/win64_vc12/osl/lib/oslquery_d.lib
    trunk/lib/win64_vc12/osl/shaders/emitter.oso
    trunk/lib/win64_vc12/osl/shaders/glass.oso
    trunk/lib/win64_vc12/osl/shaders/image.oso
    trunk/lib/win64_vc12/osl/shaders/matte.oso
    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.oso

Removed Paths:
-------------
    trunk/lib/win64_vc12/osl/lib/libtestshade.lib
    trunk/lib/win64_vc12/osl/lib/libtestshade_d.lib

Modified: trunk/lib/win64_vc12/osl/bin/oslc.exe
===================================================================
(Binary files differ)

Modified: trunk/lib/win64_vc12/osl/bin/oslinfo.exe
===================================================================
(Binary files differ)

Modified: trunk/lib/win64_vc12/osl/bin/testrender.exe
===================================================================
(Binary files differ)

Modified: trunk/lib/win64_vc12/osl/bin/testshade.exe
===================================================================
(Binary files differ)

Modified: trunk/lib/win64_vc12/osl/bin/testshade_dso.exe
===================================================================
(Binary files differ)

Modified: trunk/lib/win64_vc12/osl/build.bat
===================================================================
--- trunk/lib/win64_vc12/osl/build.bat	2016-02-10 13:16:12 UTC (rev 61630)
+++ trunk/lib/win64_vc12/osl/build.bat	2016-02-11 12:20:36 UTC (rev 61631)
@@ -3,7 +3,7 @@
 
 set LIBDIR=%CD%\..
 set LIBNAME=osl
-set OSL_VERSION=1.6.9
+set OSL_VERSION=1.7.1
 
 set "OSL_SOURCE=https://github.com/imageworks/OpenShadingLanguage/archive/Release-%OSL_VERSION%.zip"
 
@@ -38,16 +38,16 @@
 :Build
 cd OpenShadingLanguage-Release-%OSL_VERSION%
 :: create build directory
-rmdir /s build
+:: rmdir /s build
 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 /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_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS " ^
+ -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS " ^
+ -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS " ^
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /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 ^
@@ -73,9 +73,11 @@
  -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_2 ^
+ -USE_SIMD="sse2" ^ 
+ -OSL_BUILD_TESTS=OFF ^
  -DCMAKE_BUILD_TYPE=Release
 
-nmake install
+msbuild /p:Configuration=Debug /t:Build  /p:Platform="x64" INSTALL.vcxproj
 
 goto:eof
 
@@ -84,16 +86,16 @@
 :Build_debug
 cd OpenShadingLanguage-Release-%OSL_VERSION%
 :: create build directory
-rmdir /s build
+:: rmdir /s build
 mkdir build\windows_debug
 cd build\windows_debug
 
-cmake -G "NMake Makefiles" ..\..\ ^
+cmake -G "Visual Studio 12 2013 Win64" ..\..\ ^
  -DCMAKE_INSTALL_PREFIX=%LIBDIR%\osl\debug ^
- -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_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS " ^
+ -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS " ^
+ -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS " ^
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /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 ^
@@ -117,9 +119,11 @@
  -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_2 ^
+ -USE_SIMD="sse2" ^
+ -OSL_BUILD_TESTS=OFF ^
  -DCMAKE_BUILD_TYPE=Debug
 
-nmake install
+msbuild /p:Configuration=Debug /t:Build  /p:Platform="x64" INSTALL.vcxproj
 
 goto:eof
 

Modified: trunk/lib/win64_vc12/osl/flex_bison/bin/data/c.m4
===================================================================
--- trunk/lib/win64_vc12/osl/flex_bison/bin/data/c.m4	2016-02-10 13:16:12 UTC (rev 61630)
+++ trunk/lib/win64_vc12/osl/flex_bison/bin/data/c.m4	2016-02-11 12:20:36 UTC (rev 61631)
@@ -653,6 +653,14 @@
    This macro was not mandated originally: define only if we know
    we won't break user code: when these are the locations we know.  */
 
+#ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later.  */
+# if (! defined __GNUC__ || __GNUC__ < 2 \
+      || (__GNUC__ == 2 && __GNUC_MINOR__ < 5))
+#  define __attribute__(Spec) /* empty */
+# endif
+#endif
+
 #ifndef YY_LOCATION_PRINT
 # if defined ]b4_api_PREFIX[LTYPE_IS_TRIVIAL && ]b4_api_PREFIX[LTYPE_IS_TRIVIAL
 

Modified: trunk/lib/win64_vc12/osl/flex_bison/bin/win_bison.exe
===================================================================
(Binary files differ)

Modified: trunk/lib/win64_vc12/osl/flex_bison/bin/win_flex.exe
===================================================================
(Binary files differ)

Modified: trunk/lib/win64_vc12/osl/include/OSL/genclosure.h
===================================================================
--- trunk/lib/win64_vc12/osl/include/OSL/genclosure.h	2016-02-10 13:16:12 UTC (rev 61630)
+++ trunk/lib/win64_vc12/osl/include/OSL/genclosure.h	2016-02-11 12:20:36 UTC (rev 61631)
@@ -1,86 +1,86 @@
-/*
-Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al.
-All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-* Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-* Neither the name of Sony Pictures Imageworks nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list