File tree Expand file tree Collapse file tree 2 files changed +9
-7
lines changed Expand file tree Collapse file tree 2 files changed +9
-7
lines changed Original file line number Diff line number Diff line change @@ -14,10 +14,10 @@ endif()
14
14
15
15
if (NOT SDL2_FOUND)
16
16
include (ExternalProject)
17
- ExternalProject_Add(SDL2-2.0.12
17
+ ExternalProject_Add(SDL2-2.0.14
18
18
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
21
21
CMAKE_ARGS
22
22
-DBUILD_SHARED_LIBS=ON
23
23
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
@@ -43,7 +43,7 @@ if(NOT SDL2_FOUND)
43
43
-DSDL_SENSOR=ON # On, dependency of joystick
44
44
INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR} /SDL2"
45
45
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
47
47
)
48
48
49
49
# The external project will install to the build folder, but we'll install that on make install.
Original file line number Diff line number Diff line change 1
1
--- a/CMakeLists.txt.orig 2020-04-01 14:23:24.000000000 +0000
2
2
+++ 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)
4
4
endif()
5
5
6
6
# 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()
9
11
10
12
# TODO: in configure.ac the check for timers is set on
11
13
# cygwin | mingw32* - does this include mingw32CE?
You can’t perform that action at this time.
0 commit comments