Restructuring of project

TotemArts · Sep 20, 2021 · 0874bea · 0874bea
1 parent f094ebf
commit 0874bea
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 64 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,8 @@
-target/
-Cargo.lock
+backend/target
+backend/Cargo.lock
 RenegadeX-Launcher.ini
+RenegadeX-Launcher.exe
 C:/
 .idea/
+.vs/
 RenegadeX-Launcher
-windows-target/release/
-windows-target/i686-pc-windows-gnu/
-windows-target/Renegade X Launcher.exe
-windows-target/RenegadeX-Launcher.ini
-windows-target/Cargo.lock
-windows-target/.rustc_info.json
-windows-target/RenX-Launcher.zip
diff --git a/...s-target/RenegadeX-folder-permissions.exe → RenegadeX-folder-permissions.exe b/...s-target/RenegadeX-folder-permissions.exe → RenegadeX-folder-permissions.exe
diff --git a/windows-target/SelfUpdateExecutor.exe → SelfUpdateExecutor.exe b/windows-target/SelfUpdateExecutor.exe → SelfUpdateExecutor.exe
diff --git a/Cargo.toml → backend/Cargo.toml b/Cargo.toml → backend/Cargo.toml
@@ -3,7 +3,8 @@ name = "RenegadeX-Launcher"
 version = "0.9.31"
 authors = ["SonnyX"]
 edition = "2018"
-exclude = ["target-windows/**", "target/**", "dom", "dom/**"]
+build = "build.rs"
+include = ["src/**/*", "Cargo.toml"]
 
 [dependencies]
 tokio = { version = "1.4", features = ["full"] }
@@ -25,5 +26,9 @@ flexi_logger = "0.19"
 download-async = "0.10"
 async-trait = "0.1"
 
+[build-dependencies]
+embed-resource = "1.6"
+
 [profile.release]
+opt-level = 'z'
 lto = true
diff --git a/backend/Cross.toml b/backend/Cross.toml
@@ -0,0 +1,2 @@
+[target."i686-pc-windows-gnu"]
+image = "rustembedded/cross:i686-pc-windows-gnu"
diff --git a/backend/build.rs b/backend/build.rs
@@ -0,0 +1,9 @@
+extern crate embed_resource;
+use std::env;
+
+
+fn main() {
+  if env::var("CARGO_CFG_TARGET_OS").unwrap().eq("windows") {
+    embed_resource::compile("manifest.rc");
+  }
+}
diff --git a/windows-target/manifest.rc → backend/manifest.rc b/windows-target/manifest.rc → backend/manifest.rc
diff --git a/windows-target/rx.ico → backend/rx.ico b/windows-target/rx.ico → backend/rx.ico
diff --git a/windows-target/rx.manifest → backend/rx.manifest b/windows-target/rx.manifest → backend/rx.manifest
diff --git a/src/configuration.rs → backend/src/configuration.rs b/src/configuration.rs → backend/src/configuration.rs
diff --git a/src/error-codes.rs → backend/src/error-codes.rs b/src/error-codes.rs → backend/src/error-codes.rs
diff --git a/src/error.rs → backend/src/error.rs b/src/error.rs → backend/src/error.rs
diff --git a/src/handler.rs → backend/src/handler.rs b/src/handler.rs → backend/src/handler.rs
diff --git a/src/main.rs → backend/src/main.rs b/src/main.rs → backend/src/main.rs
diff --git a/src/progress.rs → backend/src/progress.rs b/src/progress.rs → backend/src/progress.rs
diff --git a/src/spawn_wrapper.rs → backend/src/spawn_wrapper.rs b/src/spawn_wrapper.rs → backend/src/spawn_wrapper.rs
diff --git a/compile.bat b/compile.bat
@@ -0,0 +1,5 @@
+cd backend
+cross build --release --target=i686-pc-windows-gnu
+cd ..
+echo F|xcopy /Y backend\target\i686-pc-windows-gnu\release\RenegadeX-Launcher.exe RenegadeX-Launcher.exe
+pause
diff --git a/create-symlink-for-theme.sh b/create-symlink-for-theme.sh
diff --git a/windows-target/sciter.dll → sciter.dll b/windows-target/sciter.dll → sciter.dll
diff --git a/windows-target/Cargo.toml b/windows-target/Cargo.toml
diff --git a/windows-target/windows.rs b/windows-target/windows.rs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[target."i686-pc-windows-gnu"]
		image = "rustembedded/cross:i686-pc-windows-gnu"