diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-08-16 22:43:23 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-08-16 22:43:46 +0300 |
| commit | 11c845e334f394f374d11750fcff76ea778a881f (patch) | |
| tree | b4b536bcef40a4959b95af5cebee1a27ec7aaf60 /build_files/build_environment/patches | |
| parent | 7772ba766d6f5633d97cbe97717df49c7e1f8cef (diff) | |
build_environment: openimageio 1.8.13
Diffstat (limited to 'build_files/build_environment/patches')
| -rw-r--r-- | build_files/build_environment/patches/openimageio_static_libs.diff | 11 | ||||
| -rw-r--r-- | build_files/build_environment/patches/openimageio_staticexr.diff | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/build_files/build_environment/patches/openimageio_static_libs.diff b/build_files/build_environment/patches/openimageio_static_libs.diff new file mode 100644 index 00000000000..ca3d913d027 --- /dev/null +++ b/build_files/build_environment/patches/openimageio_static_libs.diff @@ -0,0 +1,11 @@ +diff -Naur external_openimageio.orig/src/cmake/compiler.cmake external_openimageio/src/cmake/compiler.cmake +--- external_openimageio.orig/src/cmake/compiler.cmake 2018-07-31 23:45:19 -0600 ++++ external_openimageio/src/cmake/compiler.cmake 2018-08-16 12:50:12 -0600 +@@ -152,6 +152,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) + + # Use ccache if found diff --git a/build_files/build_environment/patches/openimageio_staticexr.diff b/build_files/build_environment/patches/openimageio_staticexr.diff deleted file mode 100644 index e1f0f473057..00000000000 --- a/build_files/build_environment/patches/openimageio_staticexr.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt 2016-11-01 01:03:44 -0600 -+++ CMakeLists.txt 2016-12-01 09:20:12 -0700 -@@ -454,7 +454,7 @@ - add_definitions (-D_CRT_NONSTDC_NO_WARNINGS) - add_definitions (-D_SCL_SECURE_NO_WARNINGS) - add_definitions (-DJAS_WIN_MSVC_BUILD) -- add_definitions (-DOPENEXR_DLL) -+ add_definitions (-DOPJ_STATIC) - if (LINKSTATIC) - add_definitions (-DBoost_USE_STATIC_LIBS=1) - else () |