Statically link VCRUNTIME

widberg · Nov 27, 2023 · e84623c · e84623c
1 parent 0377280
commit e84623c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,9 +25,8 @@ option(FMTK_DOCS        "Build the documentation." OFF)
 set(CMAKE_CXX_STANDARD 17 CACHE INTERNAL "")
 set(CMAKE_CXX_STANDARD_REQUIRED ON CACHE INTERNAL "")
 add_definitions(-DUNICODE -D_UNICODE)
-add_compile_options("/clang:-fdebug-prefix-map=${PROJECT_SOURCE_DIR}=.")
+add_compile_options("/clang:-fdebug-prefix-map=${PROJECT_SOURCE_DIR}=." "/MT$<$<CONFIG:Debug>:d>")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake" CACHE INTERNAL "")
-set_property(GLOBAL PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>" CACHE INTERNAL "")
 
 find_package(FUEL)
 add_subdirectory(dependencies)

diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
@@ -10,10 +10,11 @@ add_subdirectory(d3d9 SYSTEM)
 add_subdirectory(discord_game_sdk SYSTEM)
 
 # LuaJIT
-set(BUILD_SHARED_LIBS ON CACHE PATH "LuaJIT Shared")
+set(BUILD_SHARED_LIBS ON CACHE PATH "LuaJIT Shared" FORCE)
 set(LUAJIT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/LuaJIT" CACHE PATH "LuaJIT directory")
 add_subdirectory(luajit-cmake SYSTEM)
 set_target_properties(libluajit PROPERTIES OUTPUT_NAME "lua5.1")
+set(BUILD_SHARED_LIBS OFF CACHE PATH "" FORCE)
 
 # re2c
 if(NOT TARGET re2c)