statically link vcruntime

gyf304 · May 7, 2021 · 4a4a32c · 4a4a32c
1 parent 8164f72
commit 4a4a32c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.16)
 
 project(lpvpn)
 
@@ -40,7 +40,10 @@ target_compile_definitions(
 )
 
 if (WIN32)
-	set_target_properties(lpvpn PROPERTIES LINK_FLAGS "/MANIFESTUAC:\"level='requireAdministrator' uiAccess='false'\" /SUBSYSTEM:WINDOWS")
+	set_target_properties(lpvpn PROPERTIES
+		LINK_FLAGS "/MANIFESTUAC:\"level='requireAdministrator' uiAccess='false'\" /SUBSYSTEM:WINDOWS"
+		MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>"
+	)
 endif()
 
 target_link_libraries(lpvpn PRIVATE wxmono lpvpn::rc Wintun DiscordGameSDK MemoryModule)

diff --git a/cmake/wxWidgets.cmake b/cmake/wxWidgets.cmake
@@ -9,6 +9,8 @@ if(NOT wxwidgets_POPULATED)
 	FetchContent_Populate(wxwidgets)
 endif()
 
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 set(wxBUILD_MONOLITHIC ON CACHE INTERNAL "")
 set(wxBUILD_SHARED OFF CACHE INTERNAL "")
+set(wxBUILD_USE_STATIC_RUNTIME ON CACHE INTERNAL "")
 add_subdirectory("${wxwidgets_SOURCE_DIR}")