From 48f70293b4b64855ce7856acd692d2f5ab9c0ce8 Mon Sep 17 00:00:00 2001 From: Kan-Ru Chen Date: Sun, 8 Dec 2024 15:18:42 +0900 Subject: [PATCH] build: do not link with libcmtd --- ChewingTextService/CMakeLists.txt | 1 + libchewing | 2 +- scripts/build_installer.bat | 2 ++ scripts/build_installer_debug.bat | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChewingTextService/CMakeLists.txt b/ChewingTextService/CMakeLists.txt index 00ba5b0..8b0e1a0 100644 --- a/ChewingTextService/CMakeLists.txt +++ b/ChewingTextService/CMakeLists.txt @@ -28,4 +28,5 @@ target_link_libraries(ChewingTextService target_link_options(ChewingTextService PRIVATE /NODEFAULTLIB:MSVCRT PRIVATE /NODEFAULTLIB:MSVCRTD + PRIVATE /NODEFAULTLIB:LIBCMTD ) \ No newline at end of file diff --git a/libchewing b/libchewing index bab0250..2a356df 160000 --- a/libchewing +++ b/libchewing @@ -1 +1 @@ -Subproject commit bab025039a24d610d5c327d6894356a3d645e441 +Subproject commit 2a356dffa30f717ce6aa08ad08af61d7ceee7352 diff --git a/scripts/build_installer.bat b/scripts/build_installer.bat index 0f080d7..8f20341 100644 --- a/scripts/build_installer.bat +++ b/scripts/build_installer.bat @@ -1,3 +1,5 @@ +set RUSTFLAGS=-Ctarget-feature=+crt-static + cmake -B build\x86 -A Win32 -DBUILD_TESTING=OFF -DVCPKG_TARGET_TRIPLET=x86-windows-static cmake --build build\x86 --config Release cmake -B build\x64 -A x64 -DBUILD_TESTING=OFF -DVCPKG_TARGET_TRIPLET=x64-windows-static diff --git a/scripts/build_installer_debug.bat b/scripts/build_installer_debug.bat index d828df2..b51784d 100644 --- a/scripts/build_installer_debug.bat +++ b/scripts/build_installer_debug.bat @@ -1,3 +1,5 @@ +set RUSTFLAGS=-Ctarget-feature=+crt-static + cmake -B build\x86 -A Win32 -DBUILD_TESTING=OFF -DVCPKG_TARGET_TRIPLET=x86-windows-static cmake --build build\x86 --config Debug cmake -B build\x64 -A x64 -DBUILD_TESTING=OFF -DVCPKG_TARGET_TRIPLET=x64-windows-static