From 9063befb71eece8ccd097f0c3f476299f5437616 Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Sun, 27 Dec 2015 16:41:55 +0000
Subject: [PATCH] Update SDL2-CS dependency.

---
 Makefile                             |  1 -
 packaging/package-all.sh             |  1 -
 thirdparty/SDL2-CS.dll.config        | 18 ------------------
 thirdparty/fetch-thirdparty-deps.ps1 |  4 ++--
 thirdparty/fetch-thirdparty-deps.sh  |  5 +++--
 5 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 thirdparty/SDL2-CS.dll.config

diff --git a/Makefile b/Makefile
index 7867c52e9c..f259e91d6d 100644
--- a/Makefile
+++ b/Makefile
@@ -330,7 +330,6 @@ cli-dependencies:
 	@./thirdparty/fetch-thirdparty-deps.sh
 	@ $(CP_R) thirdparty/download/*.dll .
 	@ $(CP_R) thirdparty/download/*.dll.config .
-	@ $(CP) thirdparty/SDL2-CS.dll.config .
 
 linux-dependencies: cli-dependencies linux-native-dependencies
 
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index bbee48755b..1345600f1e 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -53,7 +53,6 @@ cp thirdparty/download/SharpFont* packaging/built
 
 # SDL2-CS
 cp thirdparty/download/SDL2-CS* packaging/built
-cp thirdparty/SDL2-CS* packaging/built
 
 # OpenAL-CS
 cp thirdparty/download/OpenAL-CS* packaging/built
diff --git a/thirdparty/SDL2-CS.dll.config b/thirdparty/SDL2-CS.dll.config
deleted file mode 100644
index 9637cfe6b5..0000000000
--- a/thirdparty/SDL2-CS.dll.config
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/>
-  <dllmap os="linux" dll="SDL2.dll" target="libSDL2-2.0.so.0" />
-
-  <dllmap dll="soft_oal.dll" os="osx" target="/System/Library/Frameworks/OpenAL.framework/OpenAL"/>
-  <dllmap dll="soft_oal.dll" os="linux" target="libopenal.so.1"/>
-
-  <dllmap dll="opengl32.dll">
-    <dllentry os="linux" dll="libGL.so.1" />
-    <dllentry os="osx" dll="/System/Library/Frameworks/OpenGL.framework/OpenGL" />
-  </dllmap>
-
-  <dllmap dll="glu32.dll">
-    <dllentry os="linux" dll="libGLU.so.1" />
-    <dllentry os="osx" dll="/System/Library/Frameworks/OpenGL.framework/Libraries/libGLU.dylib" />
-  </dllmap>
-</configuration>
diff --git a/thirdparty/fetch-thirdparty-deps.ps1 b/thirdparty/fetch-thirdparty-deps.ps1
index a5958f8d49..0c096f276f 100644
--- a/thirdparty/fetch-thirdparty-deps.ps1
+++ b/thirdparty/fetch-thirdparty-deps.ps1
@@ -118,9 +118,9 @@ if (!(Test-Path "FuzzyLogicLibrary.dll"))
 
 if (!(Test-Path "SDL2-CS.dll"))
 {
-	echo "Fetching SDL2 C# from GitHub."
+	echo "Fetching SDL2-CS from GitHub."
 	$target = Join-Path $pwd.ToString() "SDL2-CS.dll"
-	(New-Object System.Net.WebClient).DownloadFile("https://github.com/OpenRA/SDL2-CS/releases/download/20150709/SDL2-CS.dll", $target)
+	(New-Object System.Net.WebClient).DownloadFile("https://github.com/OpenRA/SDL2-CS/releases/download/20151227/SDL2-CS.dll", $target)
 }
 
 if (!(Test-Path "OpenAL-CS.dll"))
diff --git a/thirdparty/fetch-thirdparty-deps.sh b/thirdparty/fetch-thirdparty-deps.sh
index a26f8402b2..6805d21ee8 100755
--- a/thirdparty/fetch-thirdparty-deps.sh
+++ b/thirdparty/fetch-thirdparty-deps.sh
@@ -102,9 +102,10 @@ if [ ! -f FuzzyLogicLibrary.dll ]; then
 	rm -rf FuzzyLogicLibrary
 fi
 
-if [ ! -f SDL2-CS.dll ]; then
+if [ ! -f SDL2-CS.dll -o ! -f SDL2-CS.dll.config ]; then
 	echo "Fetching SDL2-CS from GitHub."
-	curl -s -L -O https://github.com/OpenRA/SDL2-CS/releases/download/20150709/SDL2-CS.dll
+	curl -s -L -O https://github.com/OpenRA/SDL2-CS/releases/download/20151227/SDL2-CS.dll
+	curl -s -L -O https://github.com/OpenRA/SDL2-CS/releases/download/20151227/SDL2-CS.dll.config
 fi
 
 if [ ! -f OpenAL-CS.dll -o ! -f OpenAL-CS.dll.config ]; then