From 8f216043674aadeac2faf8d0370f14bf526926f9 Mon Sep 17 00:00:00 2001 From: Martin Michelsen Date: Mon, 2 Mar 2026 08:46:25 -0800 Subject: [PATCH] clean up CMakeLists a bit --- CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f964e68..70c86951 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,11 +134,12 @@ set(SOURCES add_executable(newserv ${SOURCES}) target_include_directories(newserv PUBLIC ${ASIO_INCLUDE_DIR} ${Iconv_INCLUDE_DIRS}) -target_link_libraries(newserv phosg::phosg ${Iconv_LIBRARIES} pthread resource_file::resource_file) +target_link_libraries(newserv phosg::phosg ${Iconv_LIBRARIES} resource_file::resource_file) if (WIN32) - target_compile_definitions(newserv PUBLIC -DWINVER=0x0A00 -D_WIN32_WINNT=0x0A00) - target_link_libraries(newserv ws2_32 mswsock bcrypt iphlpapi -static -static-libgcc -static-libstdc++) - target_compile_options(newserv PRIVATE -Wa,-mbig-obj) + target_compile_definitions(newserv PUBLIC WINVER=0x0A00 _WIN32_WINNT=0x0A00) + target_compile_options(newserv PRIVATE -Wa,-mbig-obj -Wno-mismatched-new-delete) + target_link_options(newserv PRIVATE -static -static-libgcc -static-libstdc++) + target_link_libraries(newserv ws2_32 mswsock bcrypt iphlpapi) endif() add_dependencies(newserv newserv-Revision-cc)