okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
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
USE_INTERNAL_JPEG=1
endif
SDLDLL=SDL.dll
ifndef SDLDLL
ifeq ($(ARCH),x86_64)
SDLDLL=SDL264.dll
else
SDLDLL=SDL2.dll
endif
endif
DEFINES=
ifeq ($(USE_RENDERER_DLOPEN),1)
@ -55,7 +60,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/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
makensis $(DEFINES) ioquake3.$(ARCH).nsi