Fix macOS only include guard in for Garch debug window.

Signed-off-by: furby™ <devs@wabi.foundation>
wabiverse · Sep 9, 2024 · b9e3ef4 · b9e3ef4
1 parent fc09bc2
commit b9e3ef4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Package.swift b/Package.swift
@@ -1194,6 +1194,7 @@ let package = Package(
         .define("HGI_EXPORTS", to: "1"),
         // enable when swift supports std.unique_ptr
         .define("SWIFT_HAS_UNIQUE_PTR", to: "0"),
+        .define("PXR_GL_SUPPORT_ENABLED", .when(platforms: Arch.OS.noembeddedapple.platform)),
         .define("PXR_METAL_SUPPORT_ENABLED", to: "1", .when(platforms: Arch.OS.apple.platform)),
         .define("PXR_METAL_SUPPORT_ENABLED", to: "0", .when(platforms: Arch.OS.linwin.platform)),
         .define("PXR_VULKAN_SUPPORT_ENABLED", to: "0"),
@@ -1291,6 +1292,7 @@ let package = Package(
         .define("MFB_ALT_PACKAGE_NAME", to: "HgiInterop"),
         .define("MFB_PACKAGE_MODULE", to: "HgiInterop"),
         .define("HGIINTEROP_EXPORTS", to: "1"),
+        .define("PXR_GL_SUPPORT_ENABLED", .when(platforms: Arch.OS.noembeddedapple.platform)),
         .define("PXR_METAL_SUPPORT_ENABLED", to: "1", .when(platforms: Arch.OS.apple.platform)),
         .define("PXR_METAL_SUPPORT_ENABLED", to: "0", .when(platforms: Arch.OS.linwin.platform)),
         .define("PXR_VULKAN_SUPPORT_ENABLED", to: "0"),

diff --git a/Sources/Garch/include/Garch/GarchDarwin/glPlatformDebugWindowDarwin.h b/Sources/Garch/include/Garch/GarchDarwin/glPlatformDebugWindowDarwin.h
@@ -26,7 +26,7 @@
 
 #include "Arch/defines.h"
 
-#if defined(__APPLE__) && defined(ARCH_OS_OSX)
+#if defined(__APPLE__)
 
 #  include <pxr/pxrns.h>