From 593315eb53602ddeff22cfd2e46b6d727808a681 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Thu, 16 Apr 2020 00:11:03 +0200 Subject: [PATCH 1/2] CMakeLists: Made build work for cross-compile with mingw Signed-off-by: Gabriel Ravier --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d00e9089..f1c626e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -245,11 +245,11 @@ set_target_properties(CSE2 PROPERTIES ################ # Link libraries -target_link_libraries(CSE2 PRIVATE ddraw.lib dsound.lib version.lib shlwapi.lib imm32.lib winmm.lib dxguid.lib) +target_link_libraries(CSE2 PRIVATE ddraw dsound version shlwapi imm32 winmm dxguid gdi32) -# Newer MSVC is missing `dinput.lib` +# Newer MSVC is missing `dinput.lib`, we need to use `dinput8.lib` if(MSVC AND MSVC_VERSION GREATER_EQUAL 1500) - target_link_libraries(CSE2 PRIVATE dinput8.lib) + target_link_libraries(CSE2 PRIVATE dinput8) else() - target_link_libraries(CSE2 PRIVATE dinput.lib) + target_link_libraries(CSE2 PRIVATE dinput) endif() From 181ecc3ec24a5623dfbf4fc83618e55787b88422 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Thu, 16 Apr 2020 00:29:43 +0200 Subject: [PATCH 2/2] CMakeLists: Reverted random comment change from 593315eb Signed-off-by: Gabriel Ravier --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f1c626e5..06876693 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -247,7 +247,7 @@ set_target_properties(CSE2 PROPERTIES # Link libraries target_link_libraries(CSE2 PRIVATE ddraw dsound version shlwapi imm32 winmm dxguid gdi32) -# Newer MSVC is missing `dinput.lib`, we need to use `dinput8.lib` +# Newer MSVC is missing `dinput.lib` if(MSVC AND MSVC_VERSION GREATER_EQUAL 1500) target_link_libraries(CSE2 PRIVATE dinput8) else()