From d8fc9d40741cd1d2c607fbfbf599233ab6e28846 Mon Sep 17 00:00:00 2001
From: erpapa <hyplcf@gmail.com>
Date: Thu, 23 Apr 2026 14:20:12 +0800
Subject: [PATCH] add universal support

---
 Makefile      | 16 ++++++++++++++--
 Package.swift |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index b258431..d03b857 100644
--- a/Makefile
+++ b/Makefile
@@ -38,10 +38,22 @@ build:
 
 	# 使用 SPM 构建 Release 版本
 	@echo "📦 使用 Swift Package Manager 编译..."
-	@swift build -c release
+	# @swift build -c release
+	@echo "📦 编译 arm64..."
+	@swift build -c release --arch arm64
+	@echo "📦 编译 x86_64..."
+	@swift build -c release --arch x86_64
 	@echo "✅ Swift 编译完成"
 	@echo ""
 
+	@echo "🔗 合并 universal binary..."
+	@lipo -create \
+		.build/arm64-apple-macosx/release/go2shell \
+		.build/x86_64-apple-macosx/release/go2shell \
+		-output .build/release/go2shell
+	@echo "✅ universal binary 已生成"
+	@echo ""
+
 	# 创建 App Bundle
 	@echo "📁 创建 App Bundle 结构..."
 	@$(MAKE) --no-print-directory create-bundle
@@ -69,7 +81,7 @@ create-bundle:
 	@cp $(RELEASE_DIR)/go2shell $(APP_BUNDLE)/Contents/MacOS/
 
 	# 复制 SPM resource bundle（本地化资源等）
-	@for bundle in $(BUILD_DIR)/arm64-apple-macosx/release/*.bundle; do \
+	@for bundle in $(BUILD_DIR)/release/*.bundle; do \
 		if [ -d "$$bundle" ]; then \
 			cp -r "$$bundle" $(APP_BUNDLE)/Contents/Resources/; \
 		fi; \
diff --git a/Package.swift b/Package.swift
index 047d7ee..ca338f0 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 6.3
+// swift-tools-version: 6.0
 import PackageDescription
 
 let package = Package(