From 2c7a8d3051496e834693a546a356304402cc8c91 Mon Sep 17 00:00:00 2001 From: Keeyou Date: Tue, 19 Dec 2023 19:54:29 +0800 Subject: [PATCH 1/4] build: use imported curl library --- CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f08ce58c..ceabe79ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4091,6 +4091,9 @@ if (BUILD_TESTS) endif() if (MSVC_CURL_EXIST) message(STATUS "Using existing curl binary: ${CURL_MSVC_DIR}") + add_library(libcurl_a STATIC IMPORTED) + set_property(TARGET libcurl_a PROPERTY + IMPORTED_LOCATION "${CURL_MSVC_DIR}/lib/libcurl_a.lib") set(CURL_FOUND TRUE) set(CURL_CFLAGS /DCURL_STATICLIB) set(CURL_INCLUDE_DIRS ${CURL_MSVC_DIR}/include) @@ -4112,7 +4115,11 @@ if (BUILD_TESTS) endif() if (MINGW_CURL_EXIST) message(STATUS "Using existing curl binary: ${CURL_MINGW_DIR}") + add_library(curl STATIC IMPORTED) + set_property(TARGET curl PROPERTY + IMPORTED_LOCATION "${CURL_MINGW_DIR}/lib/libcurl.dll.a") set(CURL_FOUND TRUE) + #set(CURL_CFLAGS -DCURL_STATICLIB) set(CURL_INCLUDE_DIRS ${CURL_MINGW_DIR}/include) set(CURL_LIBRARY_DIRS ${CURL_MINGW_DIR}/lib) set(CURL_LIBRARIES curl) From c5530634423834debd99dfbefc8242e5e424aa9c Mon Sep 17 00:00:00 2001 From: Keeyou Date: Tue, 19 Dec 2023 20:29:23 +0800 Subject: [PATCH 2/4] crashpad: don't mess winxp build --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ceabe79ac..d3639aa36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2228,7 +2228,7 @@ set(SUPPORT_LIBS url ${SUPPORT_LIBS}) set(_CRASHPAD_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/third_party/crashpad/crashpad/out/Default-${MSVC_C_ARCHITECTURE_ID}") set(_CRASHPAD_BINARY_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/third_party/crashpad/crashpad/out/Binary-${MSVC_C_ARCHITECTURE_ID}") -if (MSVC AND ${CMAKE_BUILD_TYPE} MATCHES Release AND EXISTS "${_CRASHPAD_PREFIX}/obj/client/client.lib") +if (MSVC AND NOT ALLOW_XP AND ${CMAKE_BUILD_TYPE} MATCHES Release AND EXISTS "${_CRASHPAD_PREFIX}/obj/client/client.lib") message(STATUS "Compiling with bundled crashpad client library") add_library(crashpad_common STATIC IMPORTED) set_property(TARGET crashpad_common PROPERTY From ba87b322871528f184cd8775e1293006acc6c2e5 Mon Sep 17 00:00:00 2001 From: Keeyou Date: Tue, 19 Dec 2023 20:05:02 +0800 Subject: [PATCH 3/4] win32: display enable features on about dialog --- src/win32/yass_about.rc.in | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/win32/yass_about.rc.in b/src/win32/yass_about.rc.in index 16dfd422d..68d6e6217 100644 --- a/src/win32/yass_about.rc.in +++ b/src/win32/yass_about.rc.in @@ -16,33 +16,33 @@ // -IDD_ABOUTBOX DIALOGEX 0, 0, 350, 75 +IDD_ABOUTBOX DIALOGEX 0, 0, 350, 110 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "About @YASS_APP_FULL_NAME@" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - ICON IDI_APPICON,IDC_STATIC,9,22,32,32 + ICON IDI_APPICON,IDC_STATIC,10,24,32,32 LTEXT "@YASS_APP_NAME@ Version @YASS_APP_VERSION@",IDC_STATIC,50,10,119,8,SS_NOPREFIX - LTEXT "Last Change: @YASS_APP_LAST_CHANGE@",IDC_STATIC,50,24,320,8 - LTEXT "@YASS_APP_COPYRIGHT@", - IDC_STATIC,50,37,280,21 + LTEXT "Last Change: @YASS_APP_LAST_CHANGE@",IDC_STATIC,50,24,280,8 + LTEXT "@YASS_APP_COPYRIGHT@", IDC_STATIC,50,38,280,21 + LTEXT "Enabled Feature: @YASS_APP_FEATURES@",IDC_STATIC,50,52,280,32 DEFPUSHBUTTON "OK",IDOK,273,7,32,14,WS_GROUP - LTEXT "Author: Chilledheart",IDC_STATIC,50,50,120,8 + LTEXT "Author: Chilledheart",IDC_STATIC,50,84,120,8 END // For tranditional chineses, the font should be PMingLiu -IDD_ABOUTBOX DIALOGEX 0, 0, 350, 75 +IDD_ABOUTBOX DIALOGEX 0, 0, 350, 115 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "About @YASS_APP_FULL_NAME@" FONT 9, "SimSun", 0, 0, 0x0 BEGIN - ICON IDI_APPICON,IDC_STATIC,9,22,32,32 - LTEXT "@YASS_APP_NAME@ 版本 @YASS_APP_VERSION@",IDC_STATIC,50,10,119,8,SS_NOPREFIX - LTEXT "最后改动: @YASS_APP_LAST_CHANGE@",IDC_STATIC,50,24,320,8 - LTEXT "@YASS_APP_COPYRIGHT@", - IDC_STATIC,50,37,280,21 + ICON IDI_APPICON,IDC_STATIC,10,24,32,32 + LTEXT "@YASS_APP_NAME@ 版本 @YASS_APP_VERSION@",IDC_STATIC,50,10,119,9,SS_NOPREFIX + LTEXT "最后改动: @YASS_APP_LAST_CHANGE@",IDC_STATIC,50,24,280,9 + LTEXT "@YASS_APP_COPYRIGHT@", IDC_STATIC,50,38,280,21 + LTEXT "启用功能: @YASS_APP_FEATURES@",IDC_STATIC,50,52,280,36 DEFPUSHBUTTON "确认",IDOK,273,7,32,14,WS_GROUP - LTEXT "作者: Chilledheart",IDC_STATIC,50,50,120,8 + LTEXT "作者: Chilledheart",IDC_STATIC,50,88,120,9 END From dfd65516c66ba4adf98c7f3fc6772482ea0f0f20 Mon Sep 17 00:00:00 2001 From: Keeyou Date: Tue, 19 Dec 2023 20:34:38 +0800 Subject: [PATCH 4/4] build: simplify arch name in feature.h --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d3639aa36..b1f5bd4e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -254,11 +254,11 @@ if (MSVC) if (MSVC_PROCESSOR_ARCHITECTURE STREQUAL "arm64") set(OS_AARCH64 TRUE) endif() - list(APPEND YASS_APP_FEATURES "msvc architecture: ${MSVC_PROCESSOR_ARCHITECTURE}") - list(APPEND YASS_APP_FEATURES "msvc crt linkage: ${MSVC_CRT_LINKAGE}") + list(APPEND YASS_APP_FEATURES "arch: ${MSVC_PROCESSOR_ARCHITECTURE}") + list(APPEND YASS_APP_FEATURES "${MSVC_CRT_LINKAGE} crt") elseif(APPLE) message(STATUS "Build with target architecture: ${CMAKE_OSX_ARCHITECTURES}") - list(APPEND YASS_APP_FEATURES "apple architecture: ${CMAKE_OSX_ARCHITECTURES}") + list(APPEND YASS_APP_FEATURES "arch: ${CMAKE_OSX_ARCHITECTURES}") else() if ((CMAKE_C_COMPILER_TARGET MATCHES "^i386-.*" OR CMAKE_C_COMPILER_TARGET MATCHES "^i486-.*" OR @@ -285,7 +285,7 @@ else() endif() message(STATUS "Build with target architecture: ${CMAKE_SYSTEM_PROCESSOR}") - list(APPEND YASS_APP_FEATURES "system architecture: ${CMAKE_SYSTEM_PROCESSOR}") + list(APPEND YASS_APP_FEATURES "arch: ${CMAKE_SYSTEM_PROCESSOR}") endif() if (OS_X86)