Update repo to have the dependencies in the current directory instead of above

This commit is contained in:
xenia 2024-02-04 12:06:11 +01:00
parent 153ba2cb00
commit 06790e4d08
12 changed files with 16 additions and 16 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -110,5 +110,5 @@ button_text: data.strz " "
icons:
#include "icons.inc"
#include "../../../fox32rom/fox32rom.def"
#include "../../fox32rom/fox32rom.def"
#include "../../fox32os.def"

View File

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

View File

@ -67,5 +67,5 @@ stream_write_special:
pop r0
ret
#include "../../../fox32rom/fox32rom.def"
#include "../../fox32rom/fox32rom.def"
#include "../../fox32os.def"

View File

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

View File

@ -140,5 +140,5 @@ stream_struct:
#include "text.asm"
; include system defs
#include "../../../fox32rom/fox32rom.def"
#include "../../fox32rom/fox32rom.def"
#include "../../fox32os.def"

View File

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