From 217cd01aaa4c44e4d0efcbd70c8a91cfd9cd709d Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Fri, 23 Nov 2018 09:30:43 +0100 Subject: [PATCH] Append API name to ziparchive and remove -nottf from win32 zip Win32 version includes a native implementation of TTF font printing --- src/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index 641e2fa7..d93d809b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -576,7 +576,9 @@ ifeq ($(NOTTF),1) TTFCOPT = -DNOTTF=1 TTFLOPT = TTFLIBS = - TTFLABEL = -nottf + ifneq ($(API),win32) + TTFLABEL = -nottf + endif else ifneq ($(ATARICROSS),1) TTFCOPT = @@ -824,12 +826,12 @@ endif # Create a zip archive ready for upload to the website, including binaries and sourcecode ziprelease: release $(SRCARCH) - cd .. && $(ZIP) $(ZIPOPT) "grafx2-$(VERSIONTAG)$(TTFLABEL)-$(PLATFORM).$(ZIP)" \ + cd .. && $(ZIP) $(ZIPOPT) "grafx2-$(API)-$(VERSIONTAG)$(TTFLABEL)-$(PLATFORM).$(ZIP)" \ $(BIN:../%=%) share/grafx2/gfx2def.ini $(SCRIPT_FILES:../%=%) $(SKIN_FILES:../%=%) \ share/grafx2/gfx2.gif share/icons/grafx2.svg \ $(DOC_FILES:../%=%) $(FONT_FILES:../%=%) $(SRCARCH:../%=%) $(PLATFORMFILES:../%=%) ifeq ($(PLATFORM),Darwin) - $(ZIP) $(ZIPOPT) -r ../Grafx2.app-$(VERSIONTAG).zip Grafx2.app + $(ZIP) $(ZIPOPT) -r ../Grafx2.app-$(API)-$(VERSIONTAG).zip Grafx2.app endif $(TAR) czf "../grafx2-$(VERSIONTAG)-src.tgz" $(TARTRANSFORM) \ ../src/*.c ../src/*.cpp ../src/*.h ../src/Makefile ../src/Makefile.dep \