[Bf-blender-cvs] [bcbbed0] master: Use dynamically linked SDL 1.2.15 on windows x64

[Martijn Berger]

Commit: bcbbed0ccf875160a9927a951aef9c845a63ba0a
Author: Martijn Berger
Date:   Thu Jul 31 16:43:02 2014 +0200
Branches: master
https://developer.blender.org/rBbcbbed0ccf875160a9927a951aef9c845a63ba0a

Use dynamically linked SDL 1.2.15 on windows x64

===================================================================

M	SConstruct
M	source/creator/CMakeLists.txt

===================================================================

diff --git a/SConstruct b/SConstruct
index 91ade7e..055409a 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 8331525..a697044 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)