Now using Cargo Workspaces

OSA413 · Sep 1, 2024 · d80f041 · d80f041
1 parent 052f2fe
commit d80f041
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 31 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,27 +1,6 @@
-[package]
-name = "Sonic4-ModLoader"
-description = "A mod loader for Sonic 4 Episode 1 & 2"
-version = "1.0.0"
-edition = "2021"
-authors = ["Oleg \"OSA413\" Sokolov"]
-repository = "https://github.com/OSA413/Sonic4_ModLoader"
-homepage = "https://github.com/OSA413/Sonic4_ModLoader"
-license = "MIT"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-adw = { version = "0.7", package = "libadwaita", features = ["v1_5"] }
-gtk = { version = "0.9", package = "gtk4", features = ["v4_12"] }
-
-[build-dependencies]
-glib-build-tools = "0.20"
-winresource = "0.1.17"
-
-[lib]
-name="common"
-path="src/common/lib.rs"
-
-[[bin]]
-name="ManagerLauncher"
-path="src/ManagerLauncher/main.rs"
+[workspace]
+members = [
+    "rust/common",
+    "rust/ManagerLauncher"
+]
+resolver = "2"
diff --git a/rust/ManagerLauncher/Cargo.toml b/rust/ManagerLauncher/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "ManagerLauncher"
+description = "Launches the Manager into Space"
+version = "1.0.0"
+edition = "2021"
+authors = ["Oleg \"OSA413\" Sokolov"]
+repository = "https://github.com/OSA413/Sonic4_ModLoader"
+homepage = "https://github.com/OSA413/Sonic4_ModLoader"
+license = "MIT"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+adw = { version = "0.7", package = "libadwaita", features = ["v1_5"] }
+gtk = { version = "0.9", package = "gtk4", features = ["v4_12"] }
+common = { path = "../common" }
+
+[build-dependencies]
+glib-build-tools = "0.20"
+winresource = "0.1.17"
diff --git a/build.rs → rust/ManagerLauncher/build.rs b/build.rs → rust/ManagerLauncher/build.rs
@@ -3,15 +3,15 @@ use winresource::WindowsResource;
 
 fn main() {
     glib_build_tools::compile_resources(
-        &["src/ManagerLauncher/resources"],
-        "src/ManagerLauncher/resources/resources.gresource.xml",
+        &["src/resources"],
+        "src/resources/resources.gresource.xml",
         "ManagerLauncher.gresource",
     );
 
     // TODO: make sure to include the icon only to specified bins
     if env::var_os("CARGO_CFG_WINDOWS").is_some() {
         WindowsResource::new()
-            .set_icon("icon.ico")
+            .set_icon("../../icon.ico")
             .compile()
             .unwrap();
     }

diff --git a/src/ManagerLauncher/application.rs → rust/ManagerLauncher/src/application.rs b/src/ManagerLauncher/application.rs → rust/ManagerLauncher/src/application.rs
diff --git a/src/ManagerLauncher/main.rs → rust/ManagerLauncher/src/main.rs b/src/ManagerLauncher/main.rs → rust/ManagerLauncher/src/main.rs
diff --git a/...auncher/resources/resources.gresource.xml → ...her/src/resources/resources.gresource.xml b/...auncher/resources/resources.gresource.xml → ...her/src/resources/resources.gresource.xml
diff --git a/src/ManagerLauncher/resources/window.ui → rust/ManagerLauncher/src/resources/window.ui b/src/ManagerLauncher/resources/window.ui → rust/ManagerLauncher/src/resources/window.ui
diff --git a/src/ManagerLauncher/window.rs → rust/ManagerLauncher/src/window.rs b/src/ManagerLauncher/window.rs → rust/ManagerLauncher/src/window.rs
diff --git a/rust/common/Cargo.toml b/rust/common/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "common"
+description = "A mod loader for Sonic 4 Episode 1 & 2"
+version = "1.0.0"
+edition = "2021"
+authors = ["Oleg \"OSA413\" Sokolov"]
+repository = "https://github.com/OSA413/Sonic4_ModLoader"
+homepage = "https://github.com/OSA413/Sonic4_ModLoader"
+license = "MIT"
diff --git a/src/common/launcher.rs → rust/common/src/launcher.rs b/src/common/launcher.rs → rust/common/src/launcher.rs
diff --git a/src/common/lib.rs → rust/common/src/lib.rs b/src/common/lib.rs → rust/common/src/lib.rs