From 5c1a000e24897d94ebf7208182bde9cccf7c2bab Mon Sep 17 00:00:00 2001
From: Ry <ryanst755@gmail.com>
Date: Mon, 26 Dec 2022 19:05:27 -0800
Subject: [PATCH] Move user applications into applications directory

---
 {barclock => applications/barclock}/main.asm   |   4 ++--
 {bg => applications/bg}/bg.png                 | Bin
 {bg => applications/bg}/main.asm               |   4 ++--
 {terminal => applications/terminal}/main.asm   |   4 ++--
 {terminal => applications/terminal}/stream.asm |   0
 {terminal => applications/terminal}/text.asm   |   0
 build.sh                                       |  10 +++++-----
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename {barclock => applications/barclock}/main.asm (91%)
 rename {bg => applications/bg}/bg.png (100%)
 rename {bg => applications/bg}/main.asm (86%)
 rename {terminal => applications/terminal}/main.asm (96%)
 rename {terminal => applications/terminal}/stream.asm (100%)
 rename {terminal => applications/terminal}/text.asm (100%)

diff --git a/barclock/main.asm b/applications/barclock/main.asm
similarity index 91%
rename from barclock/main.asm
rename to applications/barclock/main.asm
index e495e03..810b80e 100644
--- a/barclock/main.asm
+++ b/applications/barclock/main.asm
@@ -50,5 +50,5 @@ minute_less_than_10:
 
 second_counter: data.8 0
 
-    #include "../../fox32rom/fox32rom.def"
-    #include "../fox32os.def"
+    #include "../../../fox32rom/fox32rom.def"
+    #include "../../fox32os.def"
diff --git a/bg/bg.png b/applications/bg/bg.png
similarity index 100%
rename from bg/bg.png
rename to applications/bg/bg.png
diff --git a/bg/main.asm b/applications/bg/main.asm
similarity index 86%
rename from bg/main.asm
rename to applications/bg/main.asm
index 28e28e4..8a3100a 100644
--- a/bg/main.asm
+++ b/applications/bg/main.asm
@@ -20,5 +20,5 @@
 bg_file_name: data.str "bg      raw"
 bg_file_struct: data.fill 0, 8
 
-    #include "../../fox32rom/fox32rom.def"
-    #include "../fox32os.def"
+    #include "../../../fox32rom/fox32rom.def"
+    #include "../../fox32os.def"
diff --git a/terminal/main.asm b/applications/terminal/main.asm
similarity index 96%
rename from terminal/main.asm
rename to applications/terminal/main.asm
index 7133d0f..f7907b2 100644
--- a/terminal/main.asm
+++ b/applications/terminal/main.asm
@@ -101,5 +101,5 @@ stream_struct:
     #include "text.asm"
 
     ; include system defs
-    #include "../../fox32rom/fox32rom.def"
-    #include "../fox32os.def"
+    #include "../../../fox32rom/fox32rom.def"
+    #include "../../fox32os.def"
diff --git a/terminal/stream.asm b/applications/terminal/stream.asm
similarity index 100%
rename from terminal/stream.asm
rename to applications/terminal/stream.asm
diff --git a/terminal/text.asm b/applications/terminal/text.asm
similarity index 100%
rename from terminal/text.asm
rename to applications/terminal/text.asm
diff --git a/build.sh b/build.sh
index 6c592cc..93b3950 100755
--- a/build.sh
+++ b/build.sh
@@ -20,17 +20,17 @@ echo "assembling kernel"
 ../fox32asm/target/release/fox32asm kernel/main.asm base_image/kernel.fxf
 
 echo "assembling barclock"
-../fox32asm/target/release/fox32asm barclock/main.asm base_image/barclock.fxf
+../fox32asm/target/release/fox32asm applications/barclock/main.asm base_image/barclock.fxf
 
 echo "assembling terminal"
-../fox32asm/target/release/fox32asm terminal/main.asm base_image/terminal.fxf
+../fox32asm/target/release/fox32asm applications/terminal/main.asm base_image/terminal.fxf
 
 echo "assembling bg"
-../fox32asm/target/release/fox32asm bg/main.asm base_image/bg.fxf
+../fox32asm/target/release/fox32asm applications/bg/main.asm base_image/bg.fxf
 
 echo "creating bg.raw"
-../tools/gfx2inc/target/release/gfx2inc 640 480 bg/bg.png bg/bg.inc
-../fox32asm/target/release/fox32asm bg/bg.inc base_image/bg.raw
+../tools/gfx2inc/target/release/gfx2inc 640 480 applications/bg/bg.png applications/bg/bg.inc
+../fox32asm/target/release/fox32asm applications/bg/bg.inc base_image/bg.raw
 
 echo "adding files to fox32os.img"
 cd base_image