From 3d084b7543f87afdd1f93b9b7a4b3370a5172490 Mon Sep 17 00:00:00 2001
From: Mark <mark@betalupi.com>
Date: Sun, 26 Jan 2025 19:28:51 -0800
Subject: [PATCH] Move

---
 .gitignore                               |  3 ++-
 makefile                                 |  4 ++--
 server/.cargo/config.toml                | 17 +++++++++++++++++
 Cargo.lock => server/Cargo.lock          |  0
 Cargo.toml => server/Cargo.toml          |  0
 {src => server/src}/main.rs              |  0
 {src => server/src}/reduce/gray8.rs      |  0
 {src => server/src}/reduce/gray8_simd.rs |  0
 {src => server/src}/reduce/mod.rs        |  0
 {src => server/src}/reduce/mono.rs       |  0
 {src => server/src}/reduce/mono_simd.rs  |  0
 {src => server/src}/rmframes.rs          |  0
 {src => server/src}/streamlsb.rs         |  0
 13 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 server/.cargo/config.toml
 rename Cargo.lock => server/Cargo.lock (100%)
 rename Cargo.toml => server/Cargo.toml (100%)
 rename {src => server/src}/main.rs (100%)
 rename {src => server/src}/reduce/gray8.rs (100%)
 rename {src => server/src}/reduce/gray8_simd.rs (100%)
 rename {src => server/src}/reduce/mod.rs (100%)
 rename {src => server/src}/reduce/mono.rs (100%)
 rename {src => server/src}/reduce/mono_simd.rs (100%)
 rename {src => server/src}/rmframes.rs (100%)
 rename {src => server/src}/streamlsb.rs (100%)

diff --git a/.gitignore b/.gitignore
index 82448cc..c0be620 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-/target
+server/target
+decode/target
 /build
diff --git a/makefile b/makefile
index 775c29a..266e5b4 100644
--- a/makefile
+++ b/makefile
@@ -23,10 +23,10 @@ push: $(BUILD)/$(BIN_NAME)
 $(BUILD)/$(BIN_NAME):
 	@mkdir -p $(BUILD)
 	docker run --rm \
-		-v $(PWD):/project \
+		-v $(PWD)/server:/project \
 		-v "/project/.cargo" \
 		-w "/project" \
 		ghcr.io/toltec-dev/rust:latest \
 		cargo build --release --target=armv7-unknown-linux-gnueabihf
 	
-	cp "target/armv7-unknown-linux-gnueabihf/release/restream" "./build/$(BIN_NAME)"
\ No newline at end of file
+	cp "server/target/armv7-unknown-linux-gnueabihf/release/restream" "./build/$(BIN_NAME)"
\ No newline at end of file
diff --git a/server/.cargo/config.toml b/server/.cargo/config.toml
new file mode 100644
index 0000000..8b12537
--- /dev/null
+++ b/server/.cargo/config.toml
@@ -0,0 +1,17 @@
+[build]
+target = "armv7-unknown-linux-gnueabihf"
+
+[target.armv7-unknown-linux-gnueabihf]
+linker = "arm-linux-gnueabihf-gcc"
+rustflags = [
+    "-C",
+    "link-arg=-march=armv7-a",
+    "-C",
+    "link-arg=-marm",
+    "-C",
+    "link-arg=-mfpu=neon",
+    "-C",
+    "link-arg=-mfloat-abi=hard",
+    "-C",
+    "link-arg=-mcpu=cortex-a9",
+]
diff --git a/Cargo.lock b/server/Cargo.lock
similarity index 100%
rename from Cargo.lock
rename to server/Cargo.lock
diff --git a/Cargo.toml b/server/Cargo.toml
similarity index 100%
rename from Cargo.toml
rename to server/Cargo.toml
diff --git a/src/main.rs b/server/src/main.rs
similarity index 100%
rename from src/main.rs
rename to server/src/main.rs
diff --git a/src/reduce/gray8.rs b/server/src/reduce/gray8.rs
similarity index 100%
rename from src/reduce/gray8.rs
rename to server/src/reduce/gray8.rs
diff --git a/src/reduce/gray8_simd.rs b/server/src/reduce/gray8_simd.rs
similarity index 100%
rename from src/reduce/gray8_simd.rs
rename to server/src/reduce/gray8_simd.rs
diff --git a/src/reduce/mod.rs b/server/src/reduce/mod.rs
similarity index 100%
rename from src/reduce/mod.rs
rename to server/src/reduce/mod.rs
diff --git a/src/reduce/mono.rs b/server/src/reduce/mono.rs
similarity index 100%
rename from src/reduce/mono.rs
rename to server/src/reduce/mono.rs
diff --git a/src/reduce/mono_simd.rs b/server/src/reduce/mono_simd.rs
similarity index 100%
rename from src/reduce/mono_simd.rs
rename to server/src/reduce/mono_simd.rs
diff --git a/src/rmframes.rs b/server/src/rmframes.rs
similarity index 100%
rename from src/rmframes.rs
rename to server/src/rmframes.rs
diff --git a/src/streamlsb.rs b/server/src/streamlsb.rs
similarity index 100%
rename from src/streamlsb.rs
rename to server/src/streamlsb.rs