From 462ae2d2021795229fe1311dff49f85b3423cc12 Mon Sep 17 00:00:00 2001 From: Truman Kilen Date: Wed, 5 Jun 2024 19:56:48 -0500 Subject: [PATCH] Disable oodle by default when not compiling for Linux or Windows --- Cargo.lock | 8 ++++++++ Cargo.toml | 5 ++++- workspace_hack/Cargo.toml | 17 +++++++++++++++++ workspace_hack/src/lib.rs | 1 + 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 workspace_hack/Cargo.toml create mode 100644 workspace_hack/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index cb9f16fb..53ba8fe3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2760,6 +2760,7 @@ dependencies = [ "uasset_utils", "unreal_asset", "url", + "workspace_hack", "zip", ] @@ -5832,6 +5833,13 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "workspace_hack" +version = "0.2.10" +dependencies = [ + "repak", +] + [[package]] name = "wyz" version = "0.5.1" diff --git a/Cargo.toml b/Cargo.toml index d9780632..b62b0c2b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,7 @@ members = [ "mint_lib", "hook", "hook_resolvers", + "workspace_hack", ] [workspace.package] @@ -38,12 +39,14 @@ version.workspace = true edition.workspace = true [features] -default = ["hook", "oodle"] +default = ["hook", "oodle_platform_dependent"] hook = ["dep:hook"] oodle = ["repak/oodle_implicit_dynamic"] +oodle_platform_dependent = ["workspace_hack/oodle_platform_dependent"] debug = ["egui/deadlock_detection", "egui/extra_debug_asserts", "egui/extra_asserts"] [dependencies] +workspace_hack = { path = "workspace_hack" } ansi_term = "0.12.1" anyhow.workspace = true async-trait = "0.1.77" diff --git a/workspace_hack/Cargo.toml b/workspace_hack/Cargo.toml new file mode 100644 index 00000000..5a682159 --- /dev/null +++ b/workspace_hack/Cargo.toml @@ -0,0 +1,17 @@ +[package] +name = "workspace_hack" +repository.workspace = true +authors.workspace = true +license.workspace = true +version.workspace = true +edition.workspace = true + +[features] +default = [] +oodle_platform_dependent = ["dep:repak"] + +[target.'cfg(any(target_os = "windows", target_os = "linux"))'.dependencies] +repak = { workspace = true, optional = true, features = ["oodle_implicit_dynamic"] } + +[target.'cfg(not(any(target_os = "windows", target_os = "linux")))'.dependencies] +repak = { workspace = true, optional = true } diff --git a/workspace_hack/src/lib.rs b/workspace_hack/src/lib.rs new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/workspace_hack/src/lib.rs @@ -0,0 +1 @@ +