From 30fa39d9088d6f1f8554a51f69deb73f8d23a256 Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Thu, 21 Jun 2018 13:13:08 +0200 Subject: [PATCH] fix NSIS script --- install/Makefile | 8 +++++--- install/WinInstaller.nsi | 13 ++++++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/install/Makefile b/install/Makefile index 9d060365..2fa842fd 100644 --- a/install/Makefile +++ b/install/Makefile @@ -4,16 +4,18 @@ MAKENSIS = makensis UNZIP = unzip -o SED = sed -VERSIONTAG = ../obj/win32-sdl/versiontag +API ?= sdl + +VERSIONTAG = ../obj/win32-$(API)/versiontag VERSION := $(shell cat $(VERSIONTAG)) SOURCES = ../src-$(VERSION).tgz -INSTALLER = grafx2-$(VERSION).win32.exe +INSTALLER = grafx2-$(API)-$(VERSION).win32.exe all: $(INSTALLER) $(INSTALLER): WinInstaller.nsi $(SOURCES) $(VERSIONTAG) - $(SED) 's/VERSION .*/VERSION $(VERSION)/' $< | $(MAKENSIS) - + $(SED) -e 's/VERSION .*/VERSION $(VERSION)/' -e 's/API .*/API $(API)/' $< | $(MAKENSIS) - $(SOURCES): ../grafx2-$(VERSION)-win32.zip cd .. && $(UNZIP) grafx2-$(VERSION)-win32.zip src-$(VERSION).tgz diff --git a/install/WinInstaller.nsi b/install/WinInstaller.nsi index 4a1e30f9..ac1fc5b1 100644 --- a/install/WinInstaller.nsi +++ b/install/WinInstaller.nsi @@ -2,6 +2,7 @@ ;Based on the Example Script written by Joost Verburg !define VERSION 2.5.1946 +!define API sdl !define INSTALLSIZE 10072 @@ -15,7 +16,7 @@ ;Name and file Name "Grafx2" - OutFile "grafx2-${VERSION}.win32.exe" + OutFile "grafx2-${API}-${VERSION}.win32.exe" ;Default installation folder InstallDir "$PROGRAMFILES\Grafx2" @@ -86,12 +87,14 @@ Section "Grafx2" SecProgram File ..\src\gfx2.ico File "..\src-${VERSION}.tgz" SetOutPath "$INSTDIR\bin" - File ..\bin\grafx2.exe - File ..\bin\SDL_image.dll - File ..\bin\SDL.dll + File ..\bin\grafx2-${API}.exe + StrCmp ${API} "sdl" 0 nosdl + File ..\bin\SDL_image.dll + File ..\bin\SDL.dll + File ..\bin\SDL_ttf.dll + nosdl: File ..\bin\libfreetype-6.dll File ..\bin\libjpeg-9.dll - File ..\bin\SDL_ttf.dll File ..\bin\zlib1.dll File ..\bin\libpng16-16.dll SetOutPath "$INSTDIR\share\grafx2"