Achieve successful build on iOS.

wabiverse · Jan 15, 2024 · 85c0b5b · 85c0b5b
1 parent f54b635
commit 85c0b5b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -32,17 +32,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/wabiverse/MetaversePythonFramework",
       "state" : {
-        "revision" : "644bf6824044bc8be53b21439a7c8cd51656ca2a",
-        "version" : "3.11.5"
+        "revision" : "fc6d15f768b0a675207aecea248bd4f63f4c4133",
+        "version" : "3.11.6"
       }
     },
     {
       "identity" : "metaversevulkanframework",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/wabiverse/MetaverseVulkanFramework",
       "state" : {
-        "revision" : "d81c5b35576887a5e04211657cca1535b43ab0a5",
-        "version" : "1.26.1"
+        "revision" : "13c7061599c61a4959c558d8ec1836e5b32b640b",
+        "version" : "1.26.2"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -1150,8 +1150,8 @@ enum Arch
     {
       #if os(macOS) || os(visionOS) || os(iOS) || os(tvOS) || os(watchOS)
         [
-          .package(url: "https://github.com/wabiverse/MetaversePythonFramework", from: "3.11.5"),
-          .package(url: "https://github.com/wabiverse/MetaverseVulkanFramework", from: "1.26.1"),
+          .package(url: "https://github.com/wabiverse/MetaversePythonFramework", from: "3.11.6"),
+          .package(url: "https://github.com/wabiverse/MetaverseVulkanFramework", from: "1.26.2"),
         ]
       #else /* os(Linux) || os(Android) || os(OpenBSD) || os(FreeBSD) || os(Windows) || os(Cygwin) || os(WASI) */
         []

diff --git a/Sources/MaterialX/source/MaterialXRenderHw/WindowWrapper.cpp b/Sources/MaterialX/source/MaterialXRenderHw/WindowWrapper.cpp
@@ -8,6 +8,7 @@
 #if defined(__linux__) || defined(__FreeBSD__)
 #include <X11/Intrinsic.h>
 #elif defined(__APPLE__)
+#include <TargetConditionals.h>
 #include <MaterialX/MXRenderHwWindowCocoaWrappers.h>
 #endif
 

diff --git a/Sources/OpenColorIO/SystemMonitor.cpp b/Sources/OpenColorIO/SystemMonitor.cpp
@@ -62,7 +62,9 @@ ConstSystemMonitorsRcPtr SystemMonitors::Get() noexcept
     if (!monitors)
     {
         SystemMonitorsRcPtr m = std::make_shared<SystemMonitorsImpl>();
+#if !TARGET_OS_IPHONE
         DynamicPtrCast<SystemMonitorsImpl>(m)->getAllMonitors();
+#endif /* !TARGET_OS_IPHONE */
         monitors = m;
     }
 

diff --git a/Sources/OpenColorIO/SystemMonitor.h b/Sources/OpenColorIO/SystemMonitor.h
@@ -4,6 +4,11 @@
 #ifndef INCLUDED_OCIO_SYSTEM_MONITOR_H
 #define INCLUDED_OCIO_SYSTEM_MONITOR_H
 
+#if defined(__APPLE__)
+#include <TargetConditionals.h>
+#else /* defined(__APPLE__) */
+#define TARGET_OS_IPHONE 0
+#endif /* defined(__APPLE__) */
 
 #include <string>
 #include <vector>
@@ -30,8 +35,10 @@ class SystemMonitorsImpl : public SystemMonitors
 
     static std::string GetICCProfileFromMonitorName(const char * monitorName);
 
+#if !TARGET_OS_IPHONE
     void getAllMonitors();
-
+#endif /* !TARGET_OS_IPHONE */
+
 private:
     struct MonitorInfo
     {