From 1c1e1f61f180596c925a4ac0eddba4806d1369cd Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Tue, 1 Nov 2016 17:53:23 -0500 Subject: [PATCH] Allow overriding platform in NSIS installer MSYS2 and some mingw builds use mingw64 instead of mingw32. If you run `make installer` from the top-level, PLATFORM should be set correctly when building the installer. --- misc/nsis/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/misc/nsis/Makefile b/misc/nsis/Makefile index 82dec12f..d56fbdec 100644 --- a/misc/nsis/Makefile +++ b/misc/nsis/Makefile @@ -4,6 +4,9 @@ endif ifndef RELEASE RELEASE=0 endif +ifndef PLATFORM +PLATFORM=mingw32 +endif ifndef ARCH ARCH=x86 endif @@ -60,7 +63,7 @@ endif all: ioquake3-$(VERSION)-$(RELEASE).$(ARCH).exe ioquake3.$(ARCH).nsi: ioquake3.nsi.in - sed 's/XXXVERSIONXXX/$(VERSION)/;s/XXXRELEASEXXX/$(RELEASE)/;s/x86/$(ARCH)/g;s/SDL2.dll/$(SDLDLL)/' < $< > $@ + sed 's/XXXVERSIONXXX/$(VERSION)/;s/XXXRELEASEXXX/$(RELEASE)/;s/mingw32/$(PLATFORM)/g;s/x86/$(ARCH)/g;s/SDL2.dll/$(SDLDLL)/g' < $< > $@ ioquake3-$(VERSION)-$(RELEASE).$(ARCH).exe: ioquake3.$(ARCH).nsi makensis $(DEFINES) ioquake3.$(ARCH).nsi