From de938fe5bf996d1db6a2e3f4c0c5e8b9bbc98ad6 Mon Sep 17 00:00:00 2001 From: Kyle Franz Date: Mon, 3 Jul 2023 11:41:30 -0700 Subject: [PATCH] dll --- CMakeLists.txt | 5 +++-- triplets/x64-windows-static-release.cmake | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ba191d..b731d1d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.22) cmake_policy(SET CMP0091 NEW) -set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") project(snfm) set ( Protobuf_USE_STATIC_LIBS ON ) @@ -12,7 +12,7 @@ set(wxWidgets_USE_DEBUG OFF) # Workaround issue where wxwidgets can't find a release only build with the above flag message(STATUS "WXWIDGETS DIR " ${wxWidgets_LIB_DIR}) IF(CMAKE_BUILD_TYPE MATCHES "Release") -set(wxWidgets_LIB_DIR ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib) + set(wxWidgets_LIB_DIR ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib) endif() message(STATUS "new WXWIDGETS DIR " ${wxWidgets_LIB_DIR}) find_package(wxWidgets REQUIRED COMPONENTS core base) @@ -110,6 +110,7 @@ target_link_libraries(manage_files PRIVATE ${wxWidgets_LIBRARIES}) if(WIN32) # Magic bits to enable MFC + add_definitions(-D_AFXDLL) set(CMAKE_MFC_FLAG 2) set_target_properties(manage_files PROPERTIES WIN32_EXECUTABLE TRUE) endif() diff --git a/triplets/x64-windows-static-release.cmake b/triplets/x64-windows-static-release.cmake index 4289491..08cc245 100644 --- a/triplets/x64-windows-static-release.cmake +++ b/triplets/x64-windows-static-release.cmake @@ -1,4 +1,4 @@ set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE static) +set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_BUILD_TYPE release)