Brecht Van Lommel
802ac5ba5a
Update libraries to match VFX platform 2024, and a few other upgrades to latest versions. boost 1.82.0 deflate 1.18 (new) ffi 3.4.4 freeglut (deleted) ispc 1.12.1 llvm 17.0.6 materialx 1.38.8 mesa 23.3.0 numpy 1.24.3 opencolorio 2.3.0 openexr 3.2.1 openimageio 2.5.6.0 opensubdiv 3.6.0 openvdb 11.0.0 osl 1.13.5.0 (now dynamic) python 3.11.6 sqlite 3.42.0 sse2neon 0d6e9b3dd4 usd 23.11 vulkan 1.3.270 xm2 2.12.3 This only updates the build scripts, the precompiled libraries for each platform will land over the coming weeks. Ref #113157 Co-authored-by: Ray Molenkamp <github@lazydodo.com> Co-authored-by: Campbell Barton <campbell@blender.org> Pull Request: https://projects.blender.org/blender/blender/pulls/116420
24 lines
908 B
Diff
24 lines
908 B
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
|
|
@@ -237,7 +237,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
|
|
@@ -188,6 +189,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"
|