[ioquake3] 33/39: Allow overriding platform in NSIS installer

Simon McVittie smcv at debian.org
Sat Nov 5 20:26:25 UTC 2016


This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 1c1e1f61f180596c925a4ac0eddba4806d1369cd
Author: Zack Middleton <zturtleman at gmail.com>
Date:   Tue Nov 1 17:53:23 2016 -0500

    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 82dec12..d56fbde 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git



More information about the Pkg-games-commits mailing list