Merge pull request #960 from rlabrecque/vs2019-build-fix

Fix errors building on Windows with bundled #958

sdl2-sys/build.rs

@@ -126,7 +126,7 @@ fn patch_sdl2(sdl2_source_path: &Path) {
     let patches: Vec<(&str, &'static str)> = vec![
         // No patches at this time. If needed, add them like this:
         // ("SDL-2.x.y-filename.patch", include_str!("patches/SDL-2.x.y-filename.patch")),
-        ("SDL2-2.0.9-CMakeLists.txt.patch", include_str!("patches/SDL2-2.0.9-CMakeLists.txt.patch")),
+        ("SDL2-2.0.10-CMakeLists.txt.patch", include_str!("patches/SDL2-2.0.10-CMakeLists.txt.patch")),
     ];
     let sdl_version = format!("SDL2-{}", LASTEST_SDL2_VERSION);
 

sdl2-sys/patches/SDL2-2.0.9-CMakeLists.txt.patch → sdl2-sys/patches/SDL2-2.0.10-CMakeLists.txt.patch

@@ -1,13 +1,13 @@
 --- CMakeLists.txt	2018-10-31 08:07:22.000000000 -0700
 +++ CMakeLists.txt	2019-12-04 21:50:07.606700200 -0800
-@@ -1294,6 +1294,10 @@
+@@ -1337,6 +1337,10 @@
    # Libraries for Win32 native and MinGW
-   list(APPEND EXTRA_LIBS user32 gdi32 winmm imm32 ole32 oleaut32 version uuid advapi32 shell32)
+   list(APPEND EXTRA_LIBS user32 gdi32 winmm imm32 ole32 oleaut32 version uuid advapi32 setupapi shell32)
 
 +  if(MSVC AND NOT ${MSVC_VERSION} LESS 1920)
 +    list(APPEND EXTRA_LIBS vcruntime)
 +  endif()
 +
-   # TODO: in configure.in the check for timers is set on
+   # TODO: in configure.ac the check for timers is set on
    # cygwin | mingw32* - does this include mingw32CE?
    if(SDL_TIMERS)