Merge pull request #951 from joshuabenuck/fix-2019-link-error

Fix error building on Windows w/ 2019 Build Tools.
Rust-SDL2 · Dec 9, 2019 · e69b548 · e69b548
2 parents e865c8f + d6bc555
commit e69b548
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/sdl2-sys/build.rs b/sdl2-sys/build.rs
@@ -126,6 +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")),
     ];
     let sdl_version = format!("SDL2-{}", LASTEST_SDL2_VERSION);
 

diff --git a/sdl2-sys/patches/SDL2-2.0.9-CMakeLists.txt.patch b/sdl2-sys/patches/SDL2-2.0.9-CMakeLists.txt.patch
@@ -0,0 +1,11 @@
+--- CMakeLists.txt	2018-10-31 08:07:22.000000000 -0700
++++ CMakeLists.txt	2019-12-04 21:50:07.606700200 -0800
+@@ -1292,7 +1292,7 @@
+   endif()
+
+   # 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 shell32 vcruntime)
+
+   # TODO: in configure.in the check for timers is set on
+   # cygwin | mingw32* - does this include mingw32CE?