mirror of
https://github.com/hsoft/collapseos.git
synced 2024-11-30 23:28:06 +11:00
019d05f64c
That's my mega-commit you've all been waiting for. The code for the shell share more routines with userspace apps than with kernel units, because, well, its behavior is that of a userspace app, not a device driver. This created a weird situation with libraries and jump tables. Some routine belonging to the `kernel/` directory felt weird there. And then comes `apps/basic`, which will likely share even more code with the shell. I was seeing myself creating huge jump tables to reuse code from the shell. It didn't feel right. Moreover, we'll probably want basic-like apps to optionnally replace the shell. So here I am with this huge change in the project structure. I didn't test all recipes on hardware yet, I will do later. I might have broken some... But now, the structure feels better and the line between what belongs to `kernel` and what belongs to `apps` feels clearer.
21 lines
478 B
Makefile
21 lines
478 B
Makefile
ZASM = ../../../tools/zasm.sh
|
|
KERNEL = ../../../kernel
|
|
APPS = ../../../apps
|
|
|
|
.PHONY: all clean
|
|
all: os.sms
|
|
|
|
# -o value synced with offset in glue.asm
|
|
ed.bin: $(APPS)/ed/glue.asm
|
|
$(ZASM) -o 19 $(KERNEL) $(APPS) user.h < $< > $@
|
|
|
|
# -o value synced with offset in glue.asm
|
|
zasm.bin: $(APPS)/zasm/glue.asm
|
|
$(ZASM) -o 1d $(KERNEL) $(APPS) user.h < $< > $@
|
|
|
|
os.sms: glue.asm ed.bin zasm.bin
|
|
$(ZASM) $(KERNEL) $(APPS) ed.bin zasm.bin < $< > $@
|
|
|
|
clean:
|
|
rm -f os.sms ed.bin zasm.bin
|