fixup! Exclude C oracle targets on Windows.

Author: powerje

Package.swift

@@ -1,62 +1,82 @@
 // swift-tools-version:6.0
 import PackageDescription
 
+var products: [Product] = [
+    .library(name: "MTH", targets: ["MTH"]),
+    .library(name: "MTHColor", targets: ["MTHColor"]),
+]
+
+var targets: [Target] = [
+    // Thin C wrapper exposing system zlib to Swift.
+    // zlib is present on macOS (SDK) and Linux (Swift toolchain dependency).
+    .target(
+        name: "CZlib",
+        path: "Sources/CZlib",
+        publicHeadersPath: "include",
+        linkerSettings: [.linkedLibrary("z")]
+    ),
+    // New Swift targets
+    .target(
+        name: "MTH",
+        dependencies: [
+            .target(name: "CZlib", condition: .when(platforms: [.macOS, .linux])),
+        ],
+        path: "Sources/SwiftMTH"
+    ),
+    .target(
+        name: "MTHColor",
+        dependencies: [],
+        path: "Sources/SwiftMTHColor"
+    ),
+]
+
+// C oracle targets require unix headers (sys/time.h, zlib.h) — exclude on Windows.
+#if !os(Windows)
+products += [
+    .library(name: "Cmth", targets: ["Cmth"]),
+    .library(name: "CmthColor", targets: ["CmthColor"]),
+]
+targets += [
+    .target(
+        name: "Cmth",
+        dependencies: [],
+        path: "Sources/cmth",
+        sources: ["msdp.c", "mth.c", "telopt.c", "mud.c"],
+        publicHeadersPath: "./",
+        cSettings: [.define("MTH_LIBRARY")]
+    ),
+    .target(
+        name: "CmthColor",
+        dependencies: [],
+        path: "Sources/cmthcolor",
+        sources: ["color.c"],
+        publicHeadersPath: "./",
+        cSettings: [.define("MTH_LIBRARY")]
+    ),
+    .testTarget(
+        name: "MTHTests",
+        dependencies: ["MTH", "Cmth"]
+    ),
+    .testTarget(
+        name: "MTHColorTests",
+        dependencies: ["MTHColor", "CmthColor"]
+    ),
+]
+#else
+targets += [
+    .testTarget(
+        name: "MTHTests",
+        dependencies: ["MTH"]
+    ),
+    .testTarget(
+        name: "MTHColorTests",
+        dependencies: ["MTHColor"]
+    ),
+]
+#endif
+
 let package = Package(
     name: "mth",
-    products: [
-        .library(name: "MTH", targets: ["MTH"]),
-        .library(name: "MTHColor", targets: ["MTHColor"]),
-        // C targets retained as oracle for testing
-        .library(name: "Cmth", targets: ["Cmth"]),
-        .library(name: "CmthColor", targets: ["CmthColor"]),
-    ],
-    targets: [
-        // Thin C wrapper exposing system zlib to Swift.
-        // zlib is present on macOS (SDK) and Linux (Swift toolchain dependency).
-        .target(
-            name: "CZlib",
-            path: "Sources/CZlib",
-            publicHeadersPath: "include",
-            linkerSettings: [.linkedLibrary("z")]
-        ),
-        // Existing C targets (renamed)
-        .target(
-            name: "Cmth",
-            dependencies: [],
-            path: "Sources/cmth",
-            sources: ["msdp.c", "mth.c", "telopt.c", "mud.c"],
-            publicHeadersPath: "./",
-            cSettings: [.define("MTH_LIBRARY")]
-        ),
-        .target(
-            name: "CmthColor",
-            dependencies: [],
-            path: "Sources/cmthcolor",
-            sources: ["color.c"],
-            publicHeadersPath: "./",
-            cSettings: [.define("MTH_LIBRARY")]
-        ),
-        // New Swift targets
-        .target(
-            name: "MTH",
-            dependencies: [
-                .target(name: "CZlib", condition: .when(platforms: [.macOS, .linux])),
-            ],
-            path: "Sources/SwiftMTH"
-        ),
-        .target(
-            name: "MTHColor",
-            dependencies: [],
-            path: "Sources/SwiftMTHColor"
-        ),
-        // Test targets
-        .testTarget(
-            name: "MTHTests",
-            dependencies: ["MTH", "Cmth"]
-        ),
-        .testTarget(
-            name: "MTHColorTests",
-            dependencies: ["MTHColor", "CmthColor"]
-        ),
-    ]
+    products: products,
+    targets: targets
 )

Tests/MTHColorTests/ColorOracleTests.swift

@@ -1,3 +1,4 @@
+#if canImport(CmthColor)
 import Testing
 import CmthColor
 import MTHColor
@@ -141,3 +142,4 @@ private func assertOracleMatch(_ input: String, depth: ColorDepth, sourceLocatio
         assertOracleMatch("<FABC><BDEF>truemix", depth: depth)
     }
 }
+#endif

Tests/MTHTests/MTHTests.swift

@@ -1,3 +1,4 @@
+#if canImport(Cmth)
 import Testing
 import Cmth
 import MTH
@@ -172,3 +173,4 @@ private func gmcpPacket(_ payload: [UInt8]) -> [UInt8] {
     let cBackToMsdp = cJson2Msdp(cJson)
     #expect(backToMsdp == cBackToMsdp, "Round-trip mismatch")
 }
+#endif