diff options
| author | Nick White <git@njw.name> | 2022-03-21 18:45:34 +0000 |
|---|---|---|
| committer | Nick White <git@njw.name> | 2022-03-21 18:45:34 +0000 |
| commit | 26fdae8f8a68139731caeb8c586bd925c43af26f (patch) | |
| tree | 9bce68eb57b638baed367e42e14aeb883881db94 | |
| parent | 34b1354179d41a27035968dd20fdd2da4ac35765 (diff) | |
rescribe: put darwin builds in darwin/ rather than darwin_universal/
| -rw-r--r-- | cmd/rescribe/makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cmd/rescribe/makefile b/cmd/rescribe/makefile index c52ec1e..a755f17 100644 --- a/cmd/rescribe/makefile +++ b/cmd/rescribe/makefile @@ -21,7 +21,7 @@ OSXCROSSBIN=$(HOME)/src/osxcross/target/bin EMBEDS=embed_darwin_amd64.go embed_linux.go embed_windows.go gui.go embed_darwin_arm64.go embed_other.go GODEPS=gui.go main.go $(EMBEDS) -all: dist/linux/rescribe dist/darwin_universal/rescribe.zip dist/windows/rescribe.exe +all: dist/linux/rescribe dist/darwin/rescribe.zip dist/windows/rescribe.exe dist/linux/rescribe: $(GODEPS) go generate @@ -38,17 +38,17 @@ dist/darwin_arm64/rescribe: $(GODEPS) mkdir -p dist/darwin_arm64 PATH="$(PATH):$(OSXCROSSBIN)" CC="oa64-clang" CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build -o $@ . -dist/darwin_universal/rescribe: dist/darwin_amd64/rescribe dist/darwin_arm64/rescribe - mkdir -p dist/darwin_universal +dist/darwin/rescribe: dist/darwin_amd64/rescribe dist/darwin_arm64/rescribe + mkdir -p dist/darwin PATH="$(PATH):$(OSXCROSSBIN)" lipo -create dist/darwin_amd64/rescribe dist/darwin_arm64/rescribe -output $@ -dist/darwin_universal/Rescribe.app: dist/darwin_universal/rescribe +dist/darwin/Rescribe.app: dist/darwin/rescribe go install fyne.io/fyne/v2/cmd/fyne@v2.1.2 - fyne package --name Rescribe --exe dist/darwin_universal/rescribe --os darwin --icon icon.png + fyne package --name Rescribe --exe dist/darwin/rescribe --os darwin --icon icon.png mv Rescribe.app $@ -dist/darwin_universal/rescribe.zip: dist/darwin_universal/Rescribe.app - cd dist/darwin_universal; zip -r rescribe.zip Rescribe.app +dist/darwin/rescribe.zip: dist/darwin/Rescribe.app + cd dist/darwin; zip -r rescribe.zip Rescribe.app dist/windows/rescribe-bin.exe: $(GODEPS) go generate |