Ray molenkamp
4cb883b6b2
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
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
|
|
|