diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-05-31 22:15:40 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-05-31 22:15:40 +0300 |
| commit | 4cb883b6b2119385bbb4d1af050b491a62f52e4a (patch) | |
| tree | cc498293364e36a6464bcb70a207a9730403e465 /build_files/build_environment/patches/osl.diff | |
| parent | 6f1056ae635419245da245e70a0c7d4e6ff26a2f (diff) | |
Deps: Update OIIO + ImageLibs + OSL + Helpers
This is the cluster of OIIO and friends , since they are all kinda tangled best to deal with this as a single unit
OIIO 2.1.15.0
png 1.6.37
jpeg 2.0.4
opencolorio 1.1.1
tiff 4.1.0
OSL 1.10.10
pugixml 1.10
openjpeg 2.3.1
Differential Revision: https://developer.blender.org/D7727
Reviewed by: brecht
Diffstat (limited to 'build_files/build_environment/patches/osl.diff')
| -rw-r--r-- | build_files/build_environment/patches/osl.diff | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/build_files/build_environment/patches/osl.diff b/build_files/build_environment/patches/osl.diff index b9b5937ae2b..989800174e2 100644 --- a/build_files/build_environment/patches/osl.diff +++ b/build_files/build_environment/patches/osl.diff @@ -48,3 +48,22 @@ diff -Naur OpenShadingLanguage-Release-1.9.9/src/liboslexec/llvm_util.cpp extern size_t LLVM_Util::total_jit_memory_held () +diff -Naur OpenShadingLanguage-Release-1.9.9/CMakeLists.txt external_osl/CMakeLists.txt + --- orig/CMakeLists.txt 2020-01-27 16:22:31 -0700 ++++ external_osl/CMakeLists.txt 2020-05-13 18:04:52 -0600 +@@ -102,10 +102,11 @@ + set (OPTIX_EXTRA_LIBS CACHE STRING "Extra lib targets needed for OptiX") + set (CUDA_TARGET_ARCH "sm_35" CACHE STRING "CUDA GPU architecture (e.g. sm_35)") + +-# set (USE_OIIO_STATIC ON CACHE BOOL "If OIIO is built static") +-# if (USE_OIIO_STATIC) +-# add_definitions ("-DOIIO_STATIC_BUILD=1") +-# endif () ++set (USE_OIIO_STATIC ON CACHE BOOL "If OIIO is built static") ++if (USE_OIIO_STATIC) ++ add_definitions ("-DOIIO_STATIC_BUILD=1") ++ add_definitions ("-DOIIO_STATIC_DEFINE=1") ++endif () + + set (OSL_NO_DEFAULT_TEXTURESYSTEM OFF CACHE BOOL "Do not use create a raw OIIO::TextureSystem") + if (OSL_NO_DEFAULT_TEXTURESYSTEM)
\ No newline at end of file |