diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-08-17 02:41:35 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-08-17 02:42:37 +0300 |
| commit | 1aed77cacac4c4f560b8c87e73c109b7021dd1b3 (patch) | |
| tree | 96d3f9026b8e69ea302129c3e7b1271bbedc47b8 /build_files/build_environment/patches | |
| parent | 7fed3f1b19b74f9ea94a25a22c522b50799a5f84 (diff) | |
build_environment: osl 1.9.9
does no longer seem to bundle pugixml, so that's a new dependency.
Diffstat (limited to 'build_files/build_environment/patches')
| -rw-r--r-- | build_files/build_environment/patches/osl.diff | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/build_files/build_environment/patches/osl.diff b/build_files/build_environment/patches/osl.diff index ccf34d99699..fcb5ec4165f 100644 --- a/build_files/build_environment/patches/osl.diff +++ b/build_files/build_environment/patches/osl.diff @@ -10,29 +10,3 @@ diff -Naur osl/src/external_osl/src/cmake/flexbison.cmake osl_bak/src/external_o MAIN_DEPENDENCY ${flexsrc} DEPENDS ${${compiler_headers}} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) ---- osl/src/external_osl/src/include/OSL/oslconfig.h 2016-10-31 16:48:19 -0600 -+++ osl/src/external_osl/src/include/OSL/oslconfig.h 2018-05-27 11:18:08 -0600 -@@ -44,12 +44,18 @@ - // same if another packages is compiling against OSL and using these headers - // (OSL may be C++11 but the client package may be older, or vice versa -- - // use these two symbols to differentiate these cases, when important). --#if (__cplusplus >= 201402L) --# define OSL_CPLUSPLUS_VERSION 14 --#elif (__cplusplus >= 201103L) --# define OSL_CPLUSPLUS_VERSION 11 -+ -+// Force C++03 for MSVC in blender since svn the libraries are build with that -+#if !defined(_MSC_VER) -+ #if (__cplusplus >= 201402L) -+ # define OSL_CPLUSPLUS_VERSION 14 -+ #elif (__cplusplus >= 201103L) -+ # define OSL_CPLUSPLUS_VERSION 11 -+ #else -+ # define OSL_CPLUSPLUS_VERSION 3 /* presume C++03 */ -+ #endif - #else --# define OSL_CPLUSPLUS_VERSION 3 /* presume C++03 */ -+ # define OSL_CPLUSPLUS_VERSION 3 /* presume C++03 */ - #endif - - // Symbol export defines |