修正自定义参数问题

修正 scl-webview 依赖问题
Steve-xmh · Nov 4, 2023 · 3a4a1e2 · 3a4a1e2
1 parent 9da8425
commit 3a4a1e2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/scl-core/src/client.rs b/scl-core/src/client.rs
@@ -399,6 +399,9 @@ impl Client {
         args.push("-Dlog4j2.formatMsgNoLookups=true".into());
 
         // 用户自定义JVM参数
+        for arg in &cfg.custom_java_args {
+            args.push(arg.to_owned());
+        }
         if let Some(scl_config) = &cfg.version_info.scl_launch_config {
             if !scl_config.jvm_args.trim().is_empty() {
                 if let Ok(jvm_args) = shell_words::split(&scl_config.jvm_args) {
@@ -520,6 +523,9 @@ impl Client {
         }
 
         // 用户自定义游戏参数
+        for arg in &cfg.custom_args {
+            args.push(arg.to_owned());
+        }
         if let Some(scl_config) = &cfg.version_info.scl_launch_config {
             if !scl_config.game_args.trim().is_empty() {
                 if let Ok(game_args) = shell_words::split(&scl_config.game_args) {

diff --git a/scl-webview/Cargo.toml b/scl-webview/Cargo.toml
@@ -18,7 +18,7 @@ tracing = "0.1.40"
 
 [target.'cfg(target_os = "windows")'.dependencies]
 webview2 = "^0.1"
-winapi = { version = "*", features = ["winuser", "libloaderapi", "synchapi"] }
+winapi = { version = "*", features = ["winuser", "libloaderapi", "synchapi", "winbase"] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 libc = "*"