pogmommy/nmrpflash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify macOS release builds

Browse source
This commit is contained in:
Joseph C. Lehner 2025-03-19 18:40:10 +01:00
parent dd7b5c0c96
commit 17942bc3f1
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Makefile
View file

@ -5,7 +5,6 @@ PREFIX ?= /usr/local
VERSION := $(shell if [ -d .git ] && which git 2>&1 > /dev/null; then git describe --always | tail -c +2; else echo $$STANDALONE_VERSION; fi) VERSION := $(shell if [ -d .git ] && which git 2>&1 > /dev/null; then git describe --always | tail -c +2; else echo $$STANDALONE_VERSION; fi)
CFLAGS += -Wall -g -DNMRPFLASH_VERSION=\"$(VERSION)\" CFLAGS += -Wall -g -DNMRPFLASH_VERSION=\"$(VERSION)\"
SUFFIX ?= SUFFIX ?=
MACOS_SDK ?= macosx15.0
NPCAP_SDK = 1.13 NPCAP_SDK = 1.13
ARCH := $(shell uname -m) ARCH := $(shell uname -m)
LINUXDEPLOY = ./linuxdeploy-$(ARCH).AppImage LINUXDEPLOY = ./linuxdeploy-$(ARCH).AppImage
@ -43,15 +42,16 @@ else
LDFLAGS += -lpcap LDFLAGS += -lpcap
ifeq ($(shell uname -s),Darwin) ifeq ($(shell uname -s),Darwin)
AFL=afl-clang AFL=afl-clang
SYSROOT ?= $(shell xcrun --sdk $(MACOS_SDK) --show-sdk-path) TARGETS ?= -arch x86_64 -arch arm64
LDFLAGS += -framework CoreFoundation CFLAGS += $(TARGETS)
LDFLAGS += -framework CoreFoundation $(TARGETS)
endif endif
endif endif
.PHONY: clean install release release/macos release/linux release/win32 .PHONY: clean install release release/macos release/linux release/win32
nmrpflash$(SUFFIX): $(nmrpflash_OBJ) nmrpflash$(SUFFIX): $(nmrpflash_OBJ)
$(CC) $(CFLAGS) -o nmrpflash$(SUFFIX) $(nmrpflash_OBJ) $(LDFLAGS) $(CC) $(LDFLAGS) $^ -o $@
tftptest: tftptest:
CFLAGS=-DNMRPFLASH_TFTP_TEST make clean nmrpflash CFLAGS=-DNMRPFLASH_TFTP_TEST make clean nmrpflash
@ -93,12 +93,8 @@ nmrpflash-$(ARCH).AppImage: $(LINUXDEPLOY) release
mkdir -p $(APPDIR) mkdir -p $(APPDIR)
$(LINUXDEPLOY) --appdir $(APPDIR) -e nmrpflash -i nmrpflash.svg -o appimage --create-desktop-file $(LINUXDEPLOY) --appdir $(APPDIR) -e nmrpflash -i nmrpflash.svg -o appimage --create-desktop-file
release/macos: release/macos: release
CFLAGS="-isysroot $(SYSROOT) -target arm64-apple-macos11" SUFFIX=".arm64" make release
CFLAGS="-isysroot $(SYSROOT) -target x86_64-apple-macos10.8" SUFFIX=".x86_64" make release
lipo -create -output nmrpflash nmrpflash.x86_64 nmrpflash.arm64
zip nmrpflash-$(VERSION)-macos.zip nmrpflash zip nmrpflash-$(VERSION)-macos.zip nmrpflash
rm -f nmrpflash.x86_64 nmrpflash.arm64
release/linux: release release/linux: release
zip nmrpflash-$(VERSION)-linux.zip nmrpflash zip nmrpflash-$(VERSION)-linux.zip nmrpflash