From 52236d2016ecda17b615dd7871ed4ab3e8c8d954 Mon Sep 17 00:00:00 2001 From: d0p1 Date: Mon, 8 Jul 2024 09:03:39 +0200 Subject: [PATCH] chore: modules? --- .gitignore | 1 + Makefile | 6 +++--- modules/Makefile | 11 +++++++++++ modules/dummy/Makefile | 13 +++++++++++++ modules/dummy/dummy.asm | 2 ++ 5 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 modules/Makefile create mode 100644 modules/dummy/Makefile create mode 100644 modules/dummy/dummy.asm diff --git a/.gitignore b/.gitignore index ead8425..e084653 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ bochsrc.bxrc *.efi *.EFI *.fd +*.mod diff --git a/Makefile b/Makefile index 015bb53..e431004 100644 --- a/Makefile +++ b/Makefile @@ -26,10 +26,10 @@ LDFLAGS = QEMU_COMMON = \ -rtc base=localtime \ - -vga virtio \ - -serial mon:stdio + -vga cirrus \ + -serial mon:stdio -SUBDIRS := external tools include boot kernel lib bin +SUBDIRS := external tools include boot kernel modules lib bin TARGET = stupid.tar.gz floppy1440.img floppy2880.img ifneq ($(OS),Windows_NT) diff --git a/modules/Makefile b/modules/Makefile new file mode 100644 index 0000000..ad53768 --- /dev/null +++ b/modules/Makefile @@ -0,0 +1,11 @@ +TOPGOALS = all clean install + +SUBDIRS = dummy + +.PHONY: $(SUBDIRS) +$(SUBDIRS): + @echo "📁 boot/$@" + @DESTDIR=$(DESTDIR) $(MAKE) -C $@ $(MAKECMDGOALS) + +.PHONY: $(TOPGOALS) +$(TOPGOALS): $(SUBDIRS) diff --git a/modules/dummy/Makefile b/modules/dummy/Makefile new file mode 100644 index 0000000..2b603c2 --- /dev/null +++ b/modules/dummy/Makefile @@ -0,0 +1,13 @@ +MODULE = dummy.mod + +all: + +clean: + +$(MODULE): $(MODULE:.mod=.asm) + fasm $^ $@ + +.PHONY: install +install: $(MODULE) + @ mkdir -p $(DESTDIR) + install $< $(DESTDIR) diff --git a/modules/dummy/dummy.asm b/modules/dummy/dummy.asm new file mode 100644 index 0000000..56b2dfb --- /dev/null +++ b/modules/dummy/dummy.asm @@ -0,0 +1,2 @@ + format COFF +