From 907eb5bf7e82079af893a2907da657c2a9f68f27 Mon Sep 17 00:00:00 2001
From: Gregory A Lundberg <gregory_lundberg@gmx.com>
Date: Sun, 16 Oct 2016 00:55:24 -0500
Subject: [PATCH] Require SDL2 2.0.4 on all target platforms.

---
 CMakeLists.txt | 6 +-----
 SConstruct     | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 541cc2f929d..430b7ca1f8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,11 +58,7 @@ option(ENABLE_LIBINTL "Enable using libintl for translations instead of Boost.Lo
 option(ENABLE_HISTORY "Enable using GNU history for history in lua console" ON)
 
 
-if(UNIX AND NOT APPLE AND NOT CYGWIN)
-	find_package(SDL2 2.0.2 REQUIRED)
-else (UNIX AND NOT APPLE AND NOT CYGWIN)
-	find_package(SDL2 2.0.4 REQUIRED)
-endif (UNIX AND NOT APPLE AND NOT CYGWIN)
+find_package(SDL2 2.0.4 REQUIRED)
   
 find_package(Boost 1.36 REQUIRED COMPONENTS iostreams program_options regex system thread)
 find_package(Boost 1.40 REQUIRED COMPONENTS random)
diff --git a/SConstruct b/SConstruct
index e9352e3746f..53b746333a5 100755
--- a/SConstruct
+++ b/SConstruct
@@ -178,11 +178,7 @@ if env['distcc']:
 
 if env['ccache']: env.Tool('ccache')
 
-SDL2_version = '';
-if env["PLATFORM"] is "win32" or env["PLATFORM"] is "cygwin" or env["PLATFORM"] is "darwin":
-    SDL2_version = '2.0.4';
-else:
-    SDL2_version = '2.0.2';
+SDL2_version = '2.0.4';
 
 
 Help("""Arguments may be a mixture of switches and targets in any order.