mirror of
https://github.com/hsoft/collapseos.git
synced 2024-11-27 19:28:05 +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.
20 lines
373 B
Makefile
20 lines
373 B
Makefile
TARGETS = os.bin cfsin/helo
|
|
TOOLS = ../../../tools
|
|
ZASM = $(TOOLS)/zasm.sh
|
|
KERNEL = ../../../kernel
|
|
APPS = ../../../apps
|
|
CFSPACK = $(TOOLS)/cfspack/cfspack
|
|
|
|
.PHONY: all
|
|
all: $(TARGETS) sdcard.cfs
|
|
os.bin: glue.asm
|
|
cfsin/helo: helo.asm
|
|
$(TARGETS):
|
|
$(ZASM) $(KERNEL) $(APPS) < $< > $@
|
|
|
|
$(CFSPACK):
|
|
make -C $(TOOLS)/cfspack
|
|
|
|
sdcard.cfs: cfsin $(CFSPACK)
|
|
$(CFSPACK) $< > $@
|