Resolve remaining OIIO linker symbols.

wabiverse · Feb 13, 2024 · 32e5dbc · 32e5dbc
1 parent 003bf51
commit 32e5dbc
Show file tree

Hide file tree

Showing 22 changed files with 7 additions and 2 deletions.
diff --git a/Package.swift b/Package.swift
@@ -428,6 +428,9 @@ let package = Package(
         .define("EMBED_PLUGINS", to: "1"),
         .define("OpenImageIO_EXPORTS", to: "1"),
         .define("DISABLE_PSD", to: "1"),
+        .define("DISABLE_BMP", to: "1"),
+        .define("DISABLE_TERM", to: "1"),
+        .define("DISABLE_PNM", to: "1"),
         // FIXME: We broke the ABI for fmt::detail::get_file
         // to stop the swift compiler from crashing at this
         // function, we should fix this in the future.
@@ -578,7 +581,6 @@ let package = Package(
         .target(name: "ImGui"),
         .target(name: "OpenColorIO"),
         .target(name: "OCIOBundle"),
-        .target(name: "OpenImageIO"),
         .target(name: "OpenImageIO_Util"),
         Arch.OS.python(),
       ],
@@ -982,8 +984,11 @@ func getConfig(for target: PkgTarget) -> TargetInfo
         "gif.imageio",
         "ffmpeg.imageio",
         "dicom.imageio",
-        "oiiotool",
+        "bmp.imageio",
+        "term.imageio",
         "psd.imageio",
+        "pnm.imageio",
+        "oiiotool",
       ]
     case .ocioBundle:
       break

diff --git a/...s/OpenImageIO_Util/libutil/CMakeLists.txt → Sources/OpenImageIO/libutil/CMakeLists.txt b/...s/OpenImageIO_Util/libutil/CMakeLists.txt → Sources/OpenImageIO/libutil/CMakeLists.txt
diff --git a/Sources/OpenImageIO_Util/libutil/SHA1.cpp → Sources/OpenImageIO/libutil/SHA1.cpp b/Sources/OpenImageIO_Util/libutil/SHA1.cpp → Sources/OpenImageIO/libutil/SHA1.cpp
diff --git a/Sources/OpenImageIO_Util/libutil/SHA1.h → Sources/OpenImageIO/libutil/SHA1.h b/Sources/OpenImageIO_Util/libutil/SHA1.h → Sources/OpenImageIO/libutil/SHA1.h
diff --git a/...ces/OpenImageIO_Util/libutil/argparse.cpp → Sources/OpenImageIO/libutil/argparse.cpp b/...ces/OpenImageIO_Util/libutil/argparse.cpp → Sources/OpenImageIO/libutil/argparse.cpp
diff --git a/...es/OpenImageIO_Util/libutil/benchmark.cpp → Sources/OpenImageIO/libutil/benchmark.cpp b/...es/OpenImageIO_Util/libutil/benchmark.cpp → Sources/OpenImageIO/libutil/benchmark.cpp
diff --git a/...OpenImageIO_Util/libutil/errorhandler.cpp → Sources/OpenImageIO/libutil/errorhandler.cpp b/...OpenImageIO_Util/libutil/errorhandler.cpp → Sources/OpenImageIO/libutil/errorhandler.cpp
diff --git a/...ces/OpenImageIO_Util/libutil/farmhash.cpp → Sources/OpenImageIO/libutil/farmhash.cpp b/...ces/OpenImageIO_Util/libutil/farmhash.cpp → Sources/OpenImageIO/libutil/farmhash.cpp
diff --git a/...s/OpenImageIO_Util/libutil/filesystem.cpp → Sources/OpenImageIO/libutil/filesystem.cpp b/...s/OpenImageIO_Util/libutil/filesystem.cpp → Sources/OpenImageIO/libutil/filesystem.cpp
diff --git a/Sources/OpenImageIO_Util/libutil/filter.cpp → Sources/OpenImageIO/libutil/filter.cpp b/Sources/OpenImageIO_Util/libutil/filter.cpp → Sources/OpenImageIO/libutil/filter.cpp
diff --git a/Sources/OpenImageIO_Util/libutil/fmath.cpp → Sources/OpenImageIO/libutil/fmath.cpp b/Sources/OpenImageIO_Util/libutil/fmath.cpp → Sources/OpenImageIO/libutil/fmath.cpp
diff --git a/Sources/OpenImageIO_Util/libutil/hashes.cpp → Sources/OpenImageIO/libutil/hashes.cpp b/Sources/OpenImageIO_Util/libutil/hashes.cpp → Sources/OpenImageIO/libutil/hashes.cpp
diff --git a/...es/OpenImageIO_Util/libutil/paramlist.cpp → Sources/OpenImageIO/libutil/paramlist.cpp b/...es/OpenImageIO_Util/libutil/paramlist.cpp → Sources/OpenImageIO/libutil/paramlist.cpp
diff --git a/Sources/OpenImageIO_Util/libutil/plugin.cpp → Sources/OpenImageIO/libutil/plugin.cpp b/Sources/OpenImageIO_Util/libutil/plugin.cpp → Sources/OpenImageIO/libutil/plugin.cpp
diff --git a/...es/OpenImageIO_Util/libutil/stb_sprintf.h → Sources/OpenImageIO/libutil/stb_sprintf.h b/...es/OpenImageIO_Util/libutil/stb_sprintf.h → Sources/OpenImageIO/libutil/stb_sprintf.h
diff --git a/Sources/OpenImageIO_Util/libutil/strutil.cpp → Sources/OpenImageIO/libutil/strutil.cpp b/Sources/OpenImageIO_Util/libutil/strutil.cpp → Sources/OpenImageIO/libutil/strutil.cpp
diff --git a/Sources/OpenImageIO_Util/libutil/sysutil.cpp → Sources/OpenImageIO/libutil/sysutil.cpp b/Sources/OpenImageIO_Util/libutil/sysutil.cpp → Sources/OpenImageIO/libutil/sysutil.cpp
diff --git a/Sources/OpenImageIO_Util/libutil/thread.cpp → Sources/OpenImageIO/libutil/thread.cpp b/Sources/OpenImageIO_Util/libutil/thread.cpp → Sources/OpenImageIO/libutil/thread.cpp
diff --git a/Sources/OpenImageIO_Util/libutil/timer.cpp → Sources/OpenImageIO/libutil/timer.cpp b/Sources/OpenImageIO_Util/libutil/timer.cpp → Sources/OpenImageIO/libutil/timer.cpp
diff --git a/...ces/OpenImageIO_Util/libutil/typedesc.cpp → Sources/OpenImageIO/libutil/typedesc.cpp b/...ces/OpenImageIO_Util/libutil/typedesc.cpp → Sources/OpenImageIO/libutil/typedesc.cpp
diff --git a/Sources/OpenImageIO_Util/libutil/ustring.cpp → Sources/OpenImageIO/libutil/ustring.cpp b/Sources/OpenImageIO_Util/libutil/ustring.cpp → Sources/OpenImageIO/libutil/ustring.cpp
diff --git a/Sources/OpenImageIO_Util/libutil/xxhash.cpp → Sources/OpenImageIO/libutil/xxhash.cpp b/Sources/OpenImageIO_Util/libutil/xxhash.cpp → Sources/OpenImageIO/libutil/xxhash.cpp