merged project created workspace

Cargo.toml

@@ -1,6 +1,28 @@
+# Create workspace
 [workspace]
 
+# Use 2021 rust resolver
+resolver = "2"
+
+# Define members
 members = [
+    # Desktop client
     "desktop",
+    # Android client
     "mobile",
 ]
+
+#
+# Build profiles
+#
+# Optimize release builds for size
+[profile.release]
+opt-level = "s"
+
+# Optimize all dependencies even in debug builds:
+[profile.dev.package."*"]
+opt-level = 2
+
+# Dont optimize in debug builds for faster compilation:
+[profile.dev]
+opt-level = 0

build_info.matthias_build

@@ -1 +1 @@
-2024.08.16. 21:25
+2024.08.17. 12:21

desktop/Cargo.toml

@@ -90,15 +90,3 @@ env_logger = "0.10"
 # web:
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wasm-bindgen-futures = "0.4"
-
-
-[profile.release]
-opt-level = "s"
-
-# Optimize all dependencies even in debug builds:
-[profile.dev.package."*"]
-opt-level = 2
-
-# Dont optimize in debug builds for faster compile and better sense of code speed:
-[profile.dev]
-opt-level = 0

desktop/build.rs

@@ -20,8 +20,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>>
 
     let dll_name = std::env!("OPENCV_LINK_LIBS", "");
 
-    let release_path = PathBuf::from(format!("target/release/{dll_name}.dll"));
-    let debug_path = PathBuf::from(format!("target/debug/{dll_name}.dll"));
+    let release_path = PathBuf::from(format!("../target/release/{dll_name}.dll"));
+    let debug_path = PathBuf::from(format!("../target/debug/{dll_name}.dll"));
 
     //Move opencv dll to build folder
     match fs::read(&release_path) {
@@ -53,7 +53,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>>
 
 fn generate_emoji_header() -> Result<(), Box<dyn std::error::Error>>
 {
-    let path_to_output = PathBuf::from(format!("{}/emoji_header.rs", std::env::var("OUT_DIR")?));
+    let path_to_output = PathBuf::from(format!("{}\\emoji_header.rs", dbg!(std::env::var("OUT_DIR")?)));
 
     //This will get written to the output file
     let mut content = String::new();
@@ -67,7 +67,7 @@ fn generate_emoji_header() -> Result<(), Box<dyn std::error::Error>>
     //Emoji type directories
     let mut emoji_type_dir: Vec<PathBuf> = Vec::new();
 
-    let read_dir = fs::read_dir(PathBuf::from("icons/emojis"))?;
+    let read_dir = fs::read_dir(PathBuf::from(format!("icons/emojis")))?;
 
     for entry in read_dir {
         let dir_entry = entry?;
@@ -179,6 +179,7 @@ fn generate_emoji_header() -> Result<(), Box<dyn std::error::Error>>
 }};",
         map_body.join("\n")
     ));
+
     //Write the contents to the file
     fs::write(path_to_output, content)?;
 

desktop/build_info.matthias_build

@@ -1 +1 @@
-2024.08.17. 12:02
+2024.08.17. 13:48

desktop/rust-toolchain.toml

@@ -1,3 +1,4 @@
 [toolchain]
+channel = "nightly"
 components = [ "rustfmt", "clippy", "rustc", "rust-docs", "rust-analyzer" ]
-targets = [ "x86_64-linux-android" ]
+targets = [ "x86_64-pc-windows-msvc" ]

desktop/src/main.rs

@@ -11,6 +11,7 @@ use windows_sys::{
     w,
     Win32::UI::WindowsAndMessaging::{MessageBoxW, MB_ICONERROR},
 };
+
 #[tokio::main]
 async fn main() -> eframe::Result<()>
 {
@@ -21,10 +22,11 @@ async fn main() -> eframe::Result<()>
     env_logger::init();
 
     #[cfg(debug_assertions)]
-    console_subscriber::init();
-
-    #[cfg(debug_assertions)]
-    std::env::set_var("RUST_BACKTRACE", "1");
+    {
+        console_subscriber::init();
+
+        std::env::set_var("RUST_BACKTRACE", "1");
+    }
 
     //set custom panic hook
     #[cfg(not(debug_assertions))]

mobile/Cargo.toml

@@ -61,9 +61,7 @@ egui-notify = "0.15.0"
 tokio-console = "0.1.10"
 console-subscriber = "0.2.0"
 socket2 = "0.5.7"
-wincam = "0.1.3"
 indexmap = "2.3.0"
-opencv = "0.92.2"
 
 [dependencies.uuid]
 version = "1.6.1"
@@ -89,16 +87,4 @@ env_logger = "0.10"
 
 # web:
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-wasm-bindgen-futures = "0.4"
-
-
-[profile.release]
-opt-level = "s"
-
-# Optimize all dependencies even in debug builds:
-[profile.dev.package."*"]
-opt-level = 2
-
-# Dont optimize in debug builds for faster compile and better sense of code speed:
-[profile.dev]
-opt-level = 0
+wasm-bindgen-futures = "0.4"