From 1d7c381ce226e84e7eec34af42c266bcb6fe2bee Mon Sep 17 00:00:00 2001 From: fgsfds Date: Wed, 13 Nov 2024 08:50:35 +0100 Subject: [PATCH] port: cmake: fix stdc++ linking on windows; restore the icon --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4aecdeef4..85b0717c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -204,9 +204,9 @@ list(APPEND LIBS "${GL_LIBRARY}") # Platform-specific extra libs if(NOT EXTRA_LIBRARIES) if(WIN32) - set(EXTRA_LIBRARIES dbghelp) + set(EXTRA_LIBRARIES dbghelp -static-libstdc++) else() - set(EXTRA_LIBRARIES m dl) + set(EXTRA_LIBRARIES stdc++ m dl) endif() endif() list(APPEND LIBS "${EXTRA_LIBRARIES}") @@ -279,6 +279,10 @@ set(SRC ${SRC_LIB} ) +if(WIN32) + list(APPEND SRC "${CMAKE_SOURCE_DIR}/dist/windows/icon.rc") +endif() + # Asset files generate_asset_headers("lang/" "${CMAKE_SOURCE_DIR}/tools/assetmgr/mklang" "en" JSON_HEADERS)