diff --git a/CMakeLists.txt b/CMakeLists.txt index c89f696..a3d83e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,9 @@ 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}) @@ -14,9 +17,6 @@ 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") @@ -40,4 +40,4 @@ else(WIN32) #MINGW set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Os -s --static") target_link_libraries(${PROJECT_NAME} discord-rpc ssl crypto ws2_32 ssp crypt32 z) endif(WIN32) -target_include_directories(${PROJECT_NAME} PRIVATE "include") \ No newline at end of file +target_include_directories(${PROJECT_NAME} PRIVATE "include")