forked from bartvdbraak/blender
Sybren A. Stüvel
c5e5ac4a17
This diff somewhat snowballed out of updating OIDN to 1.4.1 it had some changes that allowed us to remove the arm hacks we had in place and revert to using identical versions for a whole bunch of deps. But that required an update to ISPC which needed a newer LLVM and if we're updating LLVM we may as well update OSL, and when we update OSL, OIIO may as well be dragged in soo......anyhow... This diff updates: LLVM 9.0.0 (11.0.1 for mac/arm) -> 12.0.0 OIIO 2.1.15.0 -> 2.2.15.1 OSL 1.11.10.0 -> 1.11.14.1 winflex_bison 2.5.5-> 2.5.24 (ispc needed newer bison, windows only dep) OIDN 1.4.0 -> 1.4.1 ISPC v1.14.1(random hash for mac/arm) -> v1.16.0 Flex 2.6.4 (ISPC needed newer Flex than available on CentOS 7) and removes most of the "special arm/mac" versions. I think just ssl and embree are left with special versions. notable changes: @LazyDodo included some clang headers in the linux/mac harvest which are needed to start writing custom clang based tooling like D9465 these were already shipping on windows, but not the other platforms. [macOS] Change the `LC_ID_DYLIB` of OpenMP for {D11997}. This changes where the executables look for dylibs. Reviewed By: sebbas, LazyDodo Differential Revision: https://developer.blender.org/D11748
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
diff -Naur orig/CMakeLists.txt external_openimageio/CMakeLists.txt
|
|
--- orig/CMakeLists.txt 2020-05-10 21:43:52 -0600
|
|
+++ external_openimageio/CMakeLists.txt 2020-05-13 17:03:35 -0600
|
|
@@ -170,7 +170,7 @@
|
|
add_subdirectory (src/iinfo)
|
|
add_subdirectory (src/maketx)
|
|
add_subdirectory (src/oiiotool)
|
|
- add_subdirectory (src/testtex)
|
|
+ #add_subdirectory (src/testtex)
|
|
add_subdirectory (src/iv)
|
|
endif ()
|
|
|
|
diff -Naur orig/src/cmake/compiler.cmake external_openimageio/src/cmake/compiler.cmake
|
|
--- orig/src/cmake/compiler.cmake 2020-05-10 21:43:52 -0600
|
|
+++ external_openimageio/src/cmake/compiler.cmake 2020-05-13 17:02:54 -0600
|
|
@@ -172,6 +172,7 @@
|
|
add_definitions (-D_CRT_NONSTDC_NO_WARNINGS)
|
|
add_definitions (-D_SCL_SECURE_NO_WARNINGS)
|
|
add_definitions (-DJAS_WIN_MSVC_BUILD)
|
|
+ add_definitions (-DOPJ_STATIC)
|
|
endif (MSVC)
|
|
|
|
if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD"
|
|
diff -Naur orig/src/include/OpenImageIO/platform.h external_openimageio/src/include/OpenImageIO/platform.h
|
|
--- orig/src/include/OpenImageIO/platform.h 2020-05-10 21:43:52 -0600
|
|
+++ external_openimageio/src/include/OpenImageIO/platform.h 2020-05-13 17:04:36 -0600
|
|
@@ -41,6 +41,9 @@
|
|
# ifndef NOMINMAX
|
|
# define NOMINMAX
|
|
# endif
|
|
+# ifndef NOGDI
|
|
+# define NOGDI
|
|
+# endif
|
|
# include <windows.h>
|
|
#endif
|
|
|