Skip to content

Commit 22fd302

Browse files
authored
Merge pull request #956 from jrb0001/master
Fix build with mingw
2 parents 5df17aa + 5c8581f commit 22fd302

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
--- CMakeLists.txt 2018-10-31 08:07:22.000000000 -0700
22
+++ CMakeLists.txt 2019-12-04 21:50:07.606700200 -0800
3-
@@ -1292,7 +1292,7 @@
4-
endif()
5-
3+
@@ -1294,6 +1294,10 @@
64
# Libraries for Win32 native and MinGW
7-
- list(APPEND EXTRA_LIBS user32 gdi32 winmm imm32 ole32 oleaut32 version uuid advapi32 shell32)
8-
+ list(APPEND EXTRA_LIBS user32 gdi32 winmm imm32 ole32 oleaut32 version uuid advapi32 shell32 vcruntime)
9-
5+
list(APPEND EXTRA_LIBS user32 gdi32 winmm imm32 ole32 oleaut32 version uuid advapi32 shell32)
6+
7+
+ if(MSVC AND NOT ${MSVC_VERSION} LESS 1920)
8+
+ list(APPEND EXTRA_LIBS vcruntime)
9+
+ endif()
10+
+
1011
# TODO: in configure.in the check for timers is set on
1112
# cygwin | mingw32* - does this include mingw32CE?
13+
if(SDL_TIMERS)

0 commit comments

Comments
 (0)