m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix NSIS script

Browse Source
This commit is contained in:
Thomas Bernard 2018-06-21 13:13:08 +02:00
parent 9cfc95f67d
commit 30fa39d908
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
install/Makefile
View File

@ -4,16 +4,18 @@ MAKENSIS = makensis
UNZIP = unzip -o UNZIP = unzip -o
SED = sed SED = sed
VERSIONTAG = ../obj/win32-sdl/versiontag API ?= sdl
VERSIONTAG = ../obj/win32-$(API)/versiontag
VERSION := $(shell cat $(VERSIONTAG)) VERSION := $(shell cat $(VERSIONTAG))
SOURCES = ../src-$(VERSION).tgz SOURCES = ../src-$(VERSION).tgz
INSTALLER = grafx2-$(VERSION).win32.exe INSTALLER = grafx2-$(API)-$(VERSION).win32.exe
all: $(INSTALLER) all: $(INSTALLER)
$(INSTALLER): WinInstaller.nsi $(SOURCES) $(VERSIONTAG) $(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 $(SOURCES): ../grafx2-$(VERSION)-win32.zip
cd .. && $(UNZIP) grafx2-$(VERSION)-win32.zip src-$(VERSION).tgz cd .. && $(UNZIP) grafx2-$(VERSION)-win32.zip src-$(VERSION).tgz

13
install/WinInstaller.nsi
View File

@ -2,6 +2,7 @@
;Based on the Example Script written by Joost Verburg ;Based on the Example Script written by Joost Verburg
!define VERSION 2.5.1946 !define VERSION 2.5.1946
!define API sdl
!define INSTALLSIZE 10072 !define INSTALLSIZE 10072
@ -15,7 +16,7 @@
;Name and file ;Name and file
Name "Grafx2" Name "Grafx2"
OutFile "grafx2-${VERSION}.win32.exe" OutFile "grafx2-${API}-${VERSION}.win32.exe"
;Default installation folder ;Default installation folder
InstallDir "$PROGRAMFILES\Grafx2" InstallDir "$PROGRAMFILES\Grafx2"
@ -86,12 +87,14 @@ Section "Grafx2" SecProgram
File ..\src\gfx2.ico File ..\src\gfx2.ico
File "..\src-${VERSION}.tgz" File "..\src-${VERSION}.tgz"
SetOutPath "$INSTDIR\bin" SetOutPath "$INSTDIR\bin"
File ..\bin\grafx2.exe File ..\bin\grafx2-${API}.exe
File ..\bin\SDL_image.dll StrCmp ${API} "sdl" 0 nosdl
File ..\bin\SDL.dll File ..\bin\SDL_image.dll
File ..\bin\SDL.dll
File ..\bin\SDL_ttf.dll
nosdl:
File ..\bin\libfreetype-6.dll File ..\bin\libfreetype-6.dll
File ..\bin\libjpeg-9.dll File ..\bin\libjpeg-9.dll
File ..\bin\SDL_ttf.dll
File ..\bin\zlib1.dll File ..\bin\zlib1.dll
File ..\bin\libpng16-16.dll File ..\bin\libpng16-16.dll
SetOutPath "$INSTDIR\share\grafx2" SetOutPath "$INSTDIR\share\grafx2"