From 39bf726a006213a6bab9ee11c42950efc47e485f Mon Sep 17 00:00:00 2001 From: Morgan McColl Date: Wed, 4 Nov 2026 09:12:28 +1000 Subject: [PATCH] Remove unnecessary build flags on windows. --- Package.swift | 54 +++++++++++++-------------------------------------- 1 file changed, 14 insertions(+), 40 deletions(-) diff --git a/Package.swift b/Package.swift index 1b13128..1602de1 100644 --- a/Package.swift +++ b/Package.swift @@ -3,39 +3,6 @@ import PackageDescription -#if os(Windows) -/// The executable target. -let executableTarget = PackageDescription.Target.executableTarget( - name: "MachineGenerator", - dependencies: [ - .product(name: "ArgumentParser", package: "swift-argument-parser"), - .product(name: "VHDLMachines", package: "VHDLMachines"), - .product(name: "VHDLParsing", package: "VHDLParsing"), - .product(name: "VHDLKripkeStructureGenerator", package: "VHDLKripkeStructureGenerator"), - .product(name: "SwiftUtils", package: "SwiftUtils"), - .product(name: "VHDLJSModels", package: "VHDLJSModels"), - .product(name: "VHDLKripkeStructures", package: "VHDLKripkeStructures"), - .target(name: "GeneratorCommands"), - ], - swiftSettings: [.unsafeFlags(["-parse-as-library"])] -) -#else -/// The executable target. -let executableTarget = PackageDescription.Target.executableTarget( - name: "MachineGenerator", - dependencies: [ - .product(name: "ArgumentParser", package: "swift-argument-parser"), - .product(name: "VHDLMachines", package: "VHDLMachines"), - .product(name: "VHDLParsing", package: "VHDLParsing"), - .product(name: "VHDLKripkeStructureGenerator", package: "VHDLKripkeStructureGenerator"), - .product(name: "SwiftUtils", package: "SwiftUtils"), - .product(name: "VHDLJSModels", package: "VHDLJSModels"), - .product(name: "VHDLKripkeStructures", package: "VHDLKripkeStructures"), - .target(name: "GeneratorCommands"), - ] -) -#endif - /// Package definition. let package = Package( name: "LLFSMGenerate", @@ -61,7 +28,20 @@ let package = Package( targets: [ // Targets are the basic building blocks of a package, defining a module or a test suite. // Targets can depend on other targets in this package and products from dependencies. - executableTarget, + .executableTarget( + name: "MachineGenerator", + dependencies: [ + .product(name: "ArgumentParser", package: "swift-argument-parser"), + .product(name: "VHDLMachines", package: "VHDLMachines"), + .product(name: "VHDLParsing", package: "VHDLParsing"), + .product(name: "VHDLKripkeStructureGenerator", package: "VHDLKripkeStructureGenerator"), + .product(name: "SwiftUtils", package: "SwiftUtils"), + .product(name: "VHDLJSModels", package: "VHDLJSModels"), + .product(name: "VHDLKripkeStructures", package: "VHDLKripkeStructures"), + .target(name: "GeneratorCommands"), + ], + swiftSettings: [.unsafeFlags(["-parse-as-library"], .when(platforms: [.windows]))], + ), .target( name: "GeneratorCommands", dependencies: [ @@ -72,12 +52,6 @@ let package = Package( .product(name: "SwiftUtils", package: "SwiftUtils"), .product(name: "VHDLJSModels", package: "VHDLJSModels"), .product(name: "VHDLKripkeStructures", package: "VHDLKripkeStructures"), - ], - swiftSettings: [ - .unsafeFlags( - ["-Xfrontend", "-entry-point-function-name", "-Xfrontend", "wWinMain"], - .when(platforms: [.windows]) - ) ] ), .testTarget(