Merge pull request #294 from MoeMod/win32_sdl2_fix

fix win32 sdl2 install

Author: MoeMod

.travis.yml

@@ -196,8 +196,8 @@ jobs:
     before_script:
     - choco install nsis
     - rm C:/ProgramData/chocolatey/bin/cpack.exe
-    - curl http://libsdl.org/release/SDL2-devel-2.0.14-VC.zip -o SDL2.zip
-    - unzip SDL2.zip
+    - curl -s http://libsdl.org/release/SDL2-2.0.14.zip > SDL2-2.0.14.zip
+    - unzip SDL2-2.0.14.zip
     - mv SDL2-2.0.14 3rdparty/SDL2
     - git clone https://github.com/LuaJIT/LuaJIT 3rdparty/LuaJIT
     - git clone https://github.com/Neargye/nameof 3rdparty/nameof
@@ -229,8 +229,8 @@ jobs:
     before_script:
     - choco install nsis
     - rm C:/ProgramData/chocolatey/bin/cpack.exe
-    - curl http://libsdl.org/release/SDL2-devel-2.0.14-VC.zip -o SDL2.zip
-    - unzip SDL2.zip
+    - curl -s http://libsdl.org/release/SDL2-2.0.14.zip > SDL2-2.0.14.zip
+    - unzip SDL2-2.0.14.zip
     - mv SDL2-2.0.14 3rdparty/SDL2
     - git clone https://github.com/LuaJIT/LuaJIT 3rdparty/LuaJIT
     - git clone https://github.com/Neargye/nameof 3rdparty/nameof

3rdparty/CMakeLists.txt

@@ -19,13 +19,14 @@ if(XASH_SDL)
 			target_include_directories(sdl2 INTERFACE ${SDL2_INCLUDE_DIR})
 			if(MSVC)
 				string(REGEX REPLACE "lib$" "dll" SDL2_DLL "${SDL2_LIBRARY}")
-				install(FILES ${SDL2_DLL} DESTINATION "." OPTIONAL)
+				install(FILES ${SDL2_LIBRARY} DESTINATION "." OPTIONAL)
 			endif()
 		else()
 			if(MSVC)
 				add_definitions(-D_ftol2_sse=SDL_ftol2_sse) # fix x86 compile
 			endif()
 			set(DIRECTX OFF CACHE BOOL "" FORCE) # win10 arm dont have dx8
+			set(LIBC ON CACHE BOOL "" FORCE) # win10 arm dont have dx8
 			add_subdirectory(SDL2 EXCLUDE_FROM_ALL)
 			target_link_libraries(sdl2 INTERFACE SDL2-static)
 		endif()