Move user applications into applications directory

This commit is contained in:
Ry 2022-12-26 19:05:27 -08:00
parent b41e1dc3de
commit 5c1a000e24
7 changed files with 11 additions and 11 deletions

View File

@ -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"

View File

Before

Width:  |  Height:  |  Size: 535 KiB

After

Width:  |  Height:  |  Size: 535 KiB

View File

@ -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"

View File

@ -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"

View File

@ -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