From 29464179f56417ded11047841b096c5e2c044943 Mon Sep 17 00:00:00 2001 From: heixiansen Date: Wed, 30 Apr 2025 15:29:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5thunk=E4=BB=A5=E6=94=AF?= =?UTF-8?q?=E6=8C=81windows7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.bat | 16 ++++++++-------- src-tauri/Cargo.lock | 6 ++++++ src-tauri/Cargo.toml | 3 +++ src-tauri/build.rs | 1 + 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/build.bat b/build.bat index 10d8fc9..a2b2e41 100644 --- a/build.bat +++ b/build.bat @@ -1,12 +1,12 @@ pnpm run build -rustup default nightly -rem 使用rust nightly构建支持win7的版本,请先将根目录的windows.0.48.5 放入以下目录 -rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64 -rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86 -rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64 -rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x86 -pnpm tauri build -- -Z build-std --target x86_64-win7-windows-msvc +@REM rustup default nightly +@REM rem 使用rust nightly构建支持win7的版本,请先将根目录的windows.0.48.5 放入以下目录 +@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64 +@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86 +@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64 +@REM rem C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x86 +@REM pnpm tauri build -- -Z build-std --target x86_64-win7-windows-msvc rustup default stable pnpm tauri build pnpm run release -pnpm run release-win7 \ No newline at end of file +@REM pnpm run release-win7 \ No newline at end of file diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index cf7928d..f864bbd 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -1273,6 +1273,7 @@ dependencies = [ "tauri-plugin-shell", "tauri-plugin-single-instance", "tauri-plugin-window-state", + "thunk-rs", "tokio", "whoami", "windows 0.58.0", @@ -5166,6 +5167,11 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "thunk-rs" +version = "0.3.3" +source = "git+https://github.com/easytier/thunk.git#5e8371a3100dbc18dda952a2036c6bd6fb0504db" + [[package]] name = "tiff" version = "0.9.1" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 4d9edd0..aaa058d 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -21,6 +21,9 @@ crate-type = ["staticlib", "cdylib", "rlib"] tauri-build = { version = "2.2.0", features = [] } # prost-build = "0.13.2" +[target.x86_64-pc-windows-msvc.build-dependencies] +thunk-rs = { git = "https://github.com/easytier/thunk.git", default-features = false, features = ["win7"] } # 需要安装curl和7zip,并添加他们的路径到环境变量 + [dependencies] serde_json = "1.0.137" serde = { version = "1.0.217", features = ["derive"] } diff --git a/src-tauri/build.rs b/src-tauri/build.rs index 1ae8b50..d9bb0c5 100644 --- a/src-tauri/build.rs +++ b/src-tauri/build.rs @@ -1,4 +1,5 @@ fn main() { + thunk::thunk(); let mut windows = tauri_build::WindowsAttributes::new(); windows = windows.app_manifest( r#"