From bcbbed0ccf875160a9927a951aef9c845a63ba0a Mon Sep 17 00:00:00 2001
From: Martijn Berger <martijn.berger@gmail.com>
Date: Thu, 31 Jul 2014 16:43:02 +0200
Subject: [PATCH] Use dynamically linked SDL 1.2.15 on windows x64

---
 SConstruct                    |  5 +----
 source/creator/CMakeLists.txt | 10 ++++------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/SConstruct b/SConstruct
index 91ade7ec0cd..055409a3dba 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1101,10 +1101,7 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
         dllsources += ['${BF_PTHREADS_LIBPATH}/${BF_PTHREADS_LIB}.dll']
 
     if env['WITH_BF_SDL']:
-        if env['OURPLATFORM'] == 'win64-vc':
-            pass # we link statically already to SDL on win64
-        else:
-            dllsources.append('${BF_SDL_LIBPATH}/SDL.dll')
+        dllsources.append('${BF_SDL_LIBPATH}/SDL.dll')
 
     if env['WITH_BF_PYTHON']:
         if env['BF_DEBUG']:
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 83315250ad2..a6970444947 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -737,12 +737,10 @@ elseif(WIN32)
 	endif()
 
 	if(WITH_SDL)
-		if(NOT CMAKE_CL_64)
-			install(
-				FILES ${LIBDIR}/sdl/lib/SDL.dll
-				DESTINATION ${TARGETDIR}
-			)
-		endif()
+		install(
+			FILES ${LIBDIR}/sdl/lib/SDL.dll
+			DESTINATION ${TARGETDIR}
+		)
 	endif()
 
 	if(NOT CMAKE_CL_64)