Skip to content

Commit 3fd02f4

Browse files
authored
Update SDL2 vendored library to 2.0.14. (#202)
This should get rid of some warnings when building on Windows. Signed-off-by: Chris Lalancette <[email protected]>
1 parent 2ccffbb commit 3fd02f4

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

sdl2_vendor/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ endif()
1414

1515
if(NOT SDL2_FOUND)
1616
include(ExternalProject)
17-
ExternalProject_Add(SDL2-2.0.12
17+
ExternalProject_Add(SDL2-2.0.14
1818
PREFIX SDL2-2.0.12
19-
URL https://www.libsdl.org/release/SDL2-2.0.12.tar.gz
20-
URL_MD5 783b6f2df8ff02b19bb5ce492b99c8ff
19+
URL https://www.libsdl.org/release/SDL2-2.0.14.tar.gz
20+
URL_MD5 76ed4e6da9c07bd168b2acd9bfefab1b
2121
CMAKE_ARGS
2222
-DBUILD_SHARED_LIBS=ON
2323
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
@@ -43,7 +43,7 @@ if(NOT SDL2_FOUND)
4343
-DSDL_SENSOR=ON # On, dependency of joystick
4444
INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/SDL2"
4545
PATCH_COMMAND
46-
${CMAKE_COMMAND} -E chdir <SOURCE_DIR> git apply -p1 --ignore-space-change --whitespace=nowarn ${CMAKE_CURRENT_SOURCE_DIR}/sdl2-windows-add-vcruntime.patch
46+
${CMAKE_COMMAND} -E chdir <SOURCE_DIR> git apply -p1 --ignore-space-change --whitespace=nowarn ${CMAKE_CURRENT_SOURCE_DIR}/sdl2-windows-add-vcruntime.patch
4747
)
4848

4949
# The external project will install to the build folder, but we'll install that on make install.
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
--- a/CMakeLists.txt.orig 2020-04-01 14:23:24.000000000 +0000
22
+++ b/CMakeLists.txt 2020-04-01 14:23:38.000000000 +0000
3-
@@ -1422,7 +1422,7 @@ elseif(WINDOWS)
3+
@@ -1556,9 +1556,9 @@ elseif(WINDOWS)
44
endif()
55

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

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

0 commit comments

Comments
 (0)