Merge pull request #12 from neuschaefer/dev

Misc.
This commit is contained in:
Ry 2023-02-01 14:55:21 -08:00 committed by GitHub
commit d94611a250
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 3 deletions

1
.gitignore vendored
View File

@ -8,3 +8,4 @@
**/icons.inc
**/fox32os.img
**/fox32os.img.tmp
**/startup.cfg

View File

@ -44,7 +44,11 @@ applications/launcher/icons.inc: applications/launcher/icons.png
bootloader/bootloader.bin: bootloader/main.asm $(wildcard bootloader/*.asm)
$(FOX32ASM) $< $@
base_image/startup.cfg: base_image/startup.cfg.default
cp $< $@
FILES = \
base_image/startup.cfg \
base_image/kernel.fxf \
base_image/sh.fxf \
base_image/barclock.fxf \
@ -55,6 +59,6 @@ FILES = \
base_image/launcher.fxf
fox32os.img: $(BOOTLOADER) $(FILES)
$(RYFS) -s $(IMAGE_SIZE) -l fox32os -b $(BOOTLOADER) create fox32os.img.tmp
cd base_image; for file in *; do $(RYFS) add ../fox32os.img.tmp $$file; done
cp fox32os.img.tmp fox32os.img
$(RYFS) -s $(IMAGE_SIZE) -l fox32os -b $(BOOTLOADER) create $@.tmp
for file in $(FILES); do $(RYFS) add $@.tmp $$file; done
mv $@.tmp $@

3
fox32os Executable file
View File

@ -0,0 +1,3 @@
#!/bin/sh
FOXBASE="$(dirname "$(realpath "$0")" )"/..
"$FOXBASE"/fox32/fox32 --disk "$FOXBASE"/fox32os/fox32os.img "$@"