Skip to content

Fix errors building on Windows with bundled #958 #960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 6, 2020
Merged

Fix errors building on Windows with bundled #958 #960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdl2-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions ...s/patches/SDL2-2.0.9-CMakeLists.txt.patch → .../patches/SDL2-2.0.10-CMakeLists.txt.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)