teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-26 05:52:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Include SDL2 dll from repository in NSIS installer

Browse source 
Before it required manually copying SDL 1.2 dll into misc/nsis/ which the
engine no longer uses.
This commit is contained in:
Zack Middleton 2016-05-27 00:41:14 -05:00
parent 7811b2acb2
commit e0b2256043
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
misc/nsis/Makefile
View file

@ -28,8 +28,13 @@ endif
ifndef USE_INTERNAL_JPEG ifndef USE_INTERNAL_JPEG
USE_INTERNAL_JPEG=1 USE_INTERNAL_JPEG=1
endif endif
ifndef SDLDLL
SDLDLL=SDL.dll ifeq ($(ARCH),x86_64)
SDLDLL=SDL264.dll
else
SDLDLL=SDL2.dll
endif
endif
DEFINES= DEFINES=
ifeq ($(USE_RENDERER_DLOPEN),1) ifeq ($(USE_RENDERER_DLOPEN),1)
@ -55,7 +60,7 @@ endif
all: ioquake3-$(VERSION)-$(RELEASE).$(ARCH).exe all: ioquake3-$(VERSION)-$(RELEASE).$(ARCH).exe
ioquake3.$(ARCH).nsi: ioquake3.nsi.in ioquake3.$(ARCH).nsi: ioquake3.nsi.in
sed 's/XXXVERSIONXXX/$(VERSION)/;s/XXXRELEASEXXX/$(RELEASE)/;s/x86/$(ARCH)/g;s/SDL.dll/$(SDLDLL)/' < $< > $@ sed 's/XXXVERSIONXXX/$(VERSION)/;s/XXXRELEASEXXX/$(RELEASE)/;s/x86/$(ARCH)/g;s/SDL2.dll/$(SDLDLL)/' < $< > $@
ioquake3-$(VERSION)-$(RELEASE).$(ARCH).exe: ioquake3.$(ARCH).nsi ioquake3-$(VERSION)-$(RELEASE).$(ARCH).exe: ioquake3.$(ARCH).nsi
makensis $(DEFINES) ioquake3.$(ARCH).nsi makensis $(DEFINES) ioquake3.$(ARCH).nsi

10
misc/nsis/ioquake3.nsi.in
View file

@ -5,7 +5,7 @@
; This file is used to automatically build the installers in the ; This file is used to automatically build the installers in the
; openSUSE build service, don't break this! ; openSUSE build service, don't break this!
; ;
; you have to copy SDL.dll and OpenAL32.dll here manually ; you have to copy OpenAL32.dll here manually
!define MULTIUSER_MUI !define MULTIUSER_MUI
!define MULTIUSER_EXECUTIONLEVEL Highest !define MULTIUSER_EXECUTIONLEVEL Highest
@ -97,7 +97,7 @@ Section "ioquake3 (required)"
!endif !endif
File "../../COPYING.txt" File "../../COPYING.txt"
File "/oname=README.txt" "../../README" File "/oname=README.txt" "../../README.md"
File "../../id-readme.txt" File "../../id-readme.txt"
File "../../voip-readme.txt" File "../../voip-readme.txt"
@ -132,11 +132,11 @@ Section "Start Menu Shortcuts"
SectionEnd SectionEnd
Section "SDL.dll" Section "SDL2.dll"
SetOutPath $INSTDIR SetOutPath $INSTDIR
File "SDL.dll" File "../../build/release-mingw32-x86/SDL2.dll"
SectionEnd SectionEnd
@ -199,7 +199,7 @@ Section "Uninstall"
Delete $INSTDIR\jpeg8c.dll Delete $INSTDIR\jpeg8c.dll
!endif !endif
Delete $INSTDIR\SDL.dll Delete $INSTDIR\SDL2.dll
!ifdef USE_OPENAL_DLOPEN !ifdef USE_OPENAL_DLOPEN
Delete $INSTDIR\OpenAL32.dll Delete $INSTDIR\OpenAL32.dll
!endif !endif