86 lines
2.6 KiB
Diff
86 lines
2.6 KiB
Diff
diff --git a/Cargo.lock b/Cargo.lock
|
|
index 81c7e20..6ae0a17 100644
|
|
--- a/Cargo.lock
|
|
+++ b/Cargo.lock
|
|
@@ -611,15 +611,6 @@ dependencies = [
|
|
"error-code",
|
|
]
|
|
|
|
-[[package]]
|
|
-name = "cmake"
|
|
-version = "0.1.54"
|
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
|
|
-dependencies = [
|
|
- "cc",
|
|
-]
|
|
-
|
|
[[package]]
|
|
name = "cobs"
|
|
version = "0.2.3"
|
|
@@ -3243,12 +3234,6 @@ dependencies = [
|
|
"windows-sys 0.52.0",
|
|
]
|
|
|
|
-[[package]]
|
|
-name = "rpkg-config"
|
|
-version = "0.1.2"
|
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "5a2d2f3481209a6b42eec2fbb49063fb4e8d35b57023401495d4fe0f85c817f0"
|
|
-
|
|
[[package]]
|
|
name = "rustc-demangle"
|
|
version = "0.1.24"
|
|
@@ -3370,21 +3355,13 @@ version = "1.2.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
|
|
|
|
-[[package]]
|
|
-name = "sdl3-src"
|
|
-version = "3.2.16"
|
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "c5b5d192485408fa251477ea1dfb4778d864efaec72f730ce3a753deaffb27bb"
|
|
-
|
|
[[package]]
|
|
name = "sdl3-sys"
|
|
version = "0.5.2+SDL3-3.2.16"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
checksum = "f0a31799d7cbd36f2b187c32a56975fbdd371c200a91b01d4ed0faf0012bcf9c"
|
|
dependencies = [
|
|
- "cmake",
|
|
- "rpkg-config",
|
|
- "sdl3-src",
|
|
+ "pkg-config",
|
|
]
|
|
|
|
[[package]]
|
|
diff --git a/Cargo.toml b/Cargo.toml
|
|
index 82d8e99..8b15aad 100644
|
|
--- a/Cargo.toml
|
|
+++ b/Cargo.toml
|
|
@@ -18,7 +18,7 @@ serde-big-array = "0.5"
|
|
eframe = { version = "0.31", default-features = false, features = ["wayland", "x11", "glow"] }
|
|
sha2 = "0.10"
|
|
ab_glyph = "0.2"
|
|
-sdl3-sys = { version = "0.5", features = ["build-from-source-static"] }
|
|
+sdl3-sys = { version = "0.5", features = ["use-pkg-config"] }
|
|
rfd = { version = "0.15", default-features = false, features = ["xdg-portal", "tokio"] }
|
|
tokio = {version = "1.45", features = ["rt-multi-thread", "macros"] }
|
|
spin_sleep = "1.3"
|
|
diff --git a/build.rs b/build.rs
|
|
index f0c6d21..fa28e25 100644
|
|
--- a/build.rs
|
|
+++ b/build.rs
|
|
@@ -52,10 +52,7 @@ fn main() {
|
|
.include("parallel-rdp/parallel-rdp-standalone/vulkan")
|
|
.include("parallel-rdp/parallel-rdp-standalone/vulkan-headers/include")
|
|
.include("parallel-rdp/parallel-rdp-standalone/util")
|
|
- .include(
|
|
- std::path::PathBuf::from(std::env::var("DEP_SDL3_OUT_DIR").to_owned().unwrap())
|
|
- .join("include"),
|
|
- );
|
|
+ ;
|
|
|
|
let os = std::env::var("CARGO_CFG_TARGET_OS").unwrap();
|
|
let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
|