From 5b3fb123bd625d06889b96b3eabd433e19c6db38 Mon Sep 17 00:00:00 2001 From: Anonymous275 <36374260+Anonymous-275@users.noreply.github.com> Date: Tue, 28 Dec 2021 02:47:16 +0200 Subject: [PATCH] Update CMakeLists.txt --- CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a3d83e0..5b58311 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,11 @@ cmake_minimum_required(VERSION 3.0) project(BeamMP-Launcher) -set(wxBUILD_SHARED OFF) -add_subdirectory(wxWidgets) if (WIN32) - message(STATUS "MSVC -> forcing use of statically-linked runtime.") - STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) - STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) + #message(STATUS "MSVC -> forcing use of statically-linked runtime.") + #STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) + #STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) find_package(ZLIB REQUIRED) find_package(OpenSSL REQUIRED) @@ -17,6 +15,9 @@ if (WIN32) link_directories(${VcpkgRoot}/lib) endif(WIN32) +set(wxBUILD_SHARED OFF) +add_subdirectory(wxWidgets) + set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")