Skip to content
This repository was archived by the owner on May 6, 2024. It is now read-only.

Commit 50907fd

Browse files
authored
Merge pull request #104 from Jigsaw-Code/eacrh/catalyst
fix(apple, build): add separate Catalyst target
2 parents 2767d25 + 4fde1ac commit 50907fd

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

Makefile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ GOMOBILE=$(GOBIN)/gomobile
66
GOBIND=env PATH="$(GOBIN):$(PATH)" "$(GOMOBILE)" bind
77
IMPORT_PATH=github.com/Jigsaw-Code/outline-go-tun2socks
88

9-
.PHONY: android apple linux windows intra clean clean-all
9+
.PHONY: android apple apple_future linux windows intra clean clean-all
1010

11-
all: intra android linux apple windows
11+
all: intra android linux apple windows apple_future
1212

1313
# Don't strip Android debug symbols so we can upload them to crash reporting tools.
1414
ANDROID_BUILD_CMD=$(GOBIND) -a -ldflags '-w' -target=android -tags android -work
@@ -25,13 +25,17 @@ $(BUILDDIR)/android/tun2socks.aar: $(GOMOBILE)
2525
mkdir -p "$(BUILDDIR)/android"
2626
$(ANDROID_BUILD_CMD) -o "$@" $(IMPORT_PATH)/outline/android $(IMPORT_PATH)/outline/shadowsocks
2727

28-
2928
apple: $(BUILDDIR)/apple/Tun2socks.xcframework
3029

3130
$(BUILDDIR)/apple/Tun2socks.xcframework: $(GOMOBILE)
3231
# MACOSX_DEPLOYMENT_TARGET and -iosversion should match what outline-client supports.
3332
# TODO(fortuna): -s strips symbols and is obsolete. Why are we using it?
34-
export MACOSX_DEPLOYMENT_TARGET=10.14; $(GOBIND) -iosversion=9.0 -target=ios,iossimulator,macos -o $@ -ldflags '-s -w' -bundleid org.outline.tun2socks $(IMPORT_PATH)/outline/apple $(IMPORT_PATH)/outline/shadowsocks
33+
export MACOSX_DEPLOYMENT_TARGET=10.14; $(GOBIND) -iosversion=11.0 -target=ios,iossimulator,macos -o $@ -ldflags '-s -w' -bundleid org.outline.tun2socks $(IMPORT_PATH)/outline/apple $(IMPORT_PATH)/outline/shadowsocks
34+
35+
apple_future: $(BUILDDIR)/apple_future/Tun2socks.xcframework
36+
37+
$(BUILDDIR)/apple_future/Tun2socks.xcframework: $(GOMOBILE)
38+
$(GOBIND) -iosversion=13.1 -target=ios,iossimulator,maccatalyst -o $@ -ldflags '-s -w' -bundleid org.outline.tun2socks $(IMPORT_PATH)/outline/apple $(IMPORT_PATH)/outline/shadowsocks
3539

3640

3741
XGO=$(GOBIN)/xgo

0 commit comments

Comments
 (0)