From e0b2256043708c77a0381d346a939a82dccf70e6 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zturtleman@gmail.com>
Date: Fri, 27 May 2016 00:41:14 -0500
Subject: [PATCH] Include SDL2 dll from repository in NSIS installer

Before it required manually copying SDL 1.2 dll into misc/nsis/ which the
engine no longer uses.
---
 misc/nsis/Makefile        | 11 ++++++++---
 misc/nsis/ioquake3.nsi.in | 10 +++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/misc/nsis/Makefile b/misc/nsis/Makefile
index a79e4e15..82dec12f 100644
--- a/misc/nsis/Makefile
+++ b/misc/nsis/Makefile
@@ -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
diff --git a/misc/nsis/ioquake3.nsi.in b/misc/nsis/ioquake3.nsi.in
index c30391b8..de029e64 100644
--- a/misc/nsis/ioquake3.nsi.in
+++ b/misc/nsis/ioquake3.nsi.in
@@ -5,7 +5,7 @@
 ; This file is used to automatically build the installers in the
 ; 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_EXECUTIONLEVEL Highest
@@ -97,7 +97,7 @@ Section "ioquake3 (required)"
 !endif
 
   File "../../COPYING.txt"
-  File "/oname=README.txt" "../../README"
+  File "/oname=README.txt" "../../README.md"
   File "../../id-readme.txt"
   File "../../voip-readme.txt"
 
@@ -132,11 +132,11 @@ Section "Start Menu Shortcuts"
 
 SectionEnd
 
-Section "SDL.dll"
+Section "SDL2.dll"
 
   SetOutPath $INSTDIR
 
-  File "SDL.dll"
+  File "../../build/release-mingw32-x86/SDL2.dll"
 
 SectionEnd
 
@@ -199,7 +199,7 @@ Section "Uninstall"
   Delete $INSTDIR\jpeg8c.dll
 !endif
 
-  Delete $INSTDIR\SDL.dll
+  Delete $INSTDIR\SDL2.dll
 !ifdef USE_OPENAL_DLOPEN
   Delete $INSTDIR\OpenAL32.dll
 !endif