Skip to content
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

Jump to bottom

Upgrade to SDL2.0.20 #270

Merged
merged 3 commits into from
Oct 12, 2023
Merged

Upgrade to SDL2.0.20 #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31150ab
Upgrade to SDL2.0.18
roncapat Oct 5, 2023
e934a84
2.0.20
roncapat Oct 10, 2023
0c195e6
Fix vcruntime patch
roncapat Oct 12, 2023
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
8 changes: 4 additions & 4 deletions sdl2_vendor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ endif()

if(NOT SDL2_FOUND)
include(ExternalProject)
ExternalProject_Add(SDL2-2.0.14
PREFIX SDL2-2.0.12
URL https://www.libsdl.org/release/SDL2-2.0.14.tar.gz
URL_MD5 76ed4e6da9c07bd168b2acd9bfefab1b
ExternalProject_Add(SDL2-2.0.20
PREFIX SDL2-2.0.20
URL https://www.libsdl.org/release/SDL2-2.0.20.tar.gz
URL_MD5 a53acc02e1cca98c4123229069b67c9e
CMAKE_ARGS
-DBUILD_SHARED_LIBS=ON
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
Expand Down
9 changes: 3 additions & 6 deletions sdl2_vendor/sdl2-windows-add-vcruntime.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
--- a/CMakeLists.txt.orig 2020-04-01 14:23:24.000000000 +0000
+++ b/CMakeLists.txt 2020-04-01 14:23:38.000000000 +0000
@@ -1556,9 +1556,9 @@ elseif(WINDOWS)
--- a/CMakeLists.txt.orig
+++ b/CMakeLists.txt
@@ -1693,6 +1693,6 @@ elseif(WINDOWS)
endif()

# Libraries for Win32 native and MinGW
if(NOT WINDOWS_STORE)
- list(APPEND EXTRA_LIBS user32 gdi32 winmm imm32 ole32 oleaut32 version uuid advapi32 setupapi shell32)
+ list(APPEND EXTRA_LIBS vcruntime user32 gdi32 winmm imm32 ole32 oleaut32 version uuid advapi32 setupapi shell32)
endif()

# TODO: in configure.ac the check for timers is set on
# cygwin | mingw32* - does this include mingw32CE?