From 06790e4d084a9b2795f5537885b506c4fb0e94ed Mon Sep 17 00:00:00 2001 From: xenia Date: Sun, 4 Feb 2024 12:06:11 +0100 Subject: [PATCH] Update repo to have the dependencies in the current directory instead of above --- Makefile | 8 ++++---- README.md | 4 ++-- applications/barclock/main.asm | 2 +- applications/bg/main.asm | 2 +- applications/fetcher/start.asm | 2 +- applications/foxpaint/main.asm | 2 +- applications/launcher/main.asm | 2 +- applications/okmpaint/start.asm | 2 +- applications/serial/main.asm | 2 +- applications/sh/main.asm | 2 +- applications/terminal/main.asm | 2 +- kernel/main.asm | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 35b1962..977da1f 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -RYFS := $(CURDIR)/meta/ryfs/ryfs.py -FOX32ASM := ../fox32asm/target/release/fox32asm -OKAMERON := $(CURDIR)/meta/okameron/okameron.lua -GFX2INC := ../tools/gfx2inc/target/release/gfx2inc +RYFS ?= $(CURDIR)/meta/ryfs/ryfs.py +FOX32ASM ?= $(CURDIR)fox32asm/target/release/fox32asm +OKAMERON ?= $(CURDIR)/meta/okameron/okameron.lua +GFX2INC ?= $(CURDIR)/tools/gfx2inc/target/release/gfx2inc IMAGE_SIZE := 16777216 ROM_IMAGE_SIZE := 65536 diff --git a/README.md b/README.md index 5adda81..aca277e 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,9 @@ Stable releases are available on the [Releases page](https://github.com/fox32-ar Prebuilt images of the latest commit are also available on the [GitHub Actions page](https://github.com/fox32-arch/fox32os/actions). -### Building +### Building (without nix) -- Download [tools](https://github.com/fox32-arch/tools) and [fox32asm](https://github.com/fox32-arch/fox32asm). +- Download [tools](https://github.com/fox32-arch/tools) and [fox32asm](https://github.com/fox32-arch/fox32asm) into the current directory. Either use the pre-built binaries or build them. - Run `make` diff --git a/applications/barclock/main.asm b/applications/barclock/main.asm index c86791c..d653d0d 100644 --- a/applications/barclock/main.asm +++ b/applications/barclock/main.asm @@ -91,5 +91,5 @@ minute_less_than_10: second_counter: data.8 0 active_window_struct_ptr: data.32 0 - #include "../../../fox32rom/fox32rom.def" + #include "../../fox32rom/fox32rom.def" #include "../../fox32os.def" diff --git a/applications/bg/main.asm b/applications/bg/main.asm index 0d7a8ba..df5dcdb 100644 --- a/applications/bg/main.asm +++ b/applications/bg/main.asm @@ -23,5 +23,5 @@ bg_file_name: data.strz "bg.raw" bg_file_struct: data.fill 0, 32 - #include "../../../fox32rom/fox32rom.def" + #include "../../fox32rom/fox32rom.def" #include "../../fox32os.def" diff --git a/applications/fetcher/start.asm b/applications/fetcher/start.asm index 704f38e..fbd2aba 100644 --- a/applications/fetcher/start.asm +++ b/applications/fetcher/start.asm @@ -88,5 +88,5 @@ menu_items_system_list: data.8 7 ; menu width (usually longest item + 2) data.8 5 data.strz "About" ; text length, text, null-terminator - #include "../../../fox32rom/fox32rom.def" + #include "../../fox32rom/fox32rom.def" #include "../../fox32os.def" diff --git a/applications/foxpaint/main.asm b/applications/foxpaint/main.asm index e95c1ba..137e9b8 100644 --- a/applications/foxpaint/main.asm +++ b/applications/foxpaint/main.asm @@ -392,5 +392,5 @@ is_drawing: data.8 0 brush_size: data.8 4 color: data.32 0xFFFFFFFF - #include "../../../fox32rom/fox32rom.def" + #include "../../fox32rom/fox32rom.def" #include "../../fox32os.def" diff --git a/applications/launcher/main.asm b/applications/launcher/main.asm index 9341301..c0f9823 100644 --- a/applications/launcher/main.asm +++ b/applications/launcher/main.asm @@ -110,5 +110,5 @@ button_text: data.strz " " icons: #include "icons.inc" - #include "../../../fox32rom/fox32rom.def" + #include "../../fox32rom/fox32rom.def" #include "../../fox32os.def" diff --git a/applications/okmpaint/start.asm b/applications/okmpaint/start.asm index 3c3e7f8..71e6185 100644 --- a/applications/okmpaint/start.asm +++ b/applications/okmpaint/start.asm @@ -65,5 +65,5 @@ menu_items_color_list: data.8 5 data.strz "Green" ; text length, text, null-terminator data.8 4 data.strz "Blue" ; text length, text, null-terminator - #include "../../../fox32rom/fox32rom.def" + #include "../../fox32rom/fox32rom.def" #include "../../fox32os.def" diff --git a/applications/serial/main.asm b/applications/serial/main.asm index b802668..92d3099 100644 --- a/applications/serial/main.asm +++ b/applications/serial/main.asm @@ -67,5 +67,5 @@ stream_write_special: pop r0 ret - #include "../../../fox32rom/fox32rom.def" + #include "../../fox32rom/fox32rom.def" #include "../../fox32os.def" diff --git a/applications/sh/main.asm b/applications/sh/main.asm index a18992d..deb97fb 100644 --- a/applications/sh/main.asm +++ b/applications/sh/main.asm @@ -336,5 +336,5 @@ shell_char_buffer: data.32 0 #include "launch.asm" ; include system defs - #include "../../../fox32rom/fox32rom.def" + #include "../../fox32rom/fox32rom.def" #include "../../fox32os.def" diff --git a/applications/terminal/main.asm b/applications/terminal/main.asm index 4b69998..f993033 100644 --- a/applications/terminal/main.asm +++ b/applications/terminal/main.asm @@ -140,5 +140,5 @@ stream_struct: #include "text.asm" ; include system defs - #include "../../../fox32rom/fox32rom.def" + #include "../../fox32rom/fox32rom.def" #include "../../fox32os.def" diff --git a/kernel/main.asm b/kernel/main.asm index 54d337a..b40d39e 100644 --- a/kernel/main.asm +++ b/kernel/main.asm @@ -415,6 +415,6 @@ startup_bat_check_struct: data.fill 0, 32 serial_stream: data.strz ":serial" serial_stream_struct: data.fill 0, 32 - #include "../../fox32rom/fox32rom.def" + #include "../fox32rom/fox32rom.def" kernel_bottom: