From 886cc8adfa225a165f623799c63776407f7a2a95 Mon Sep 17 00:00:00 2001
From: sbosse <sbosse@uni-bremen.de>
Date: Mon, 14 Oct 2024 23:14:05 +0200
Subject: [PATCH] Mon 14 Oct 23:13:50 CEST 2024

---
 Makefile.config | 71 ++++++++++++++-----------------------------------
 1 file changed, 20 insertions(+), 51 deletions(-)

diff --git a/Makefile.config b/Makefile.config
index 6a66799..70e8bd3 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -1,54 +1,23 @@
-include Makefile.config
+KERNEL_CCFLAGS=-Wall -c -ffreestanding -fno-pie -g -std=gnu99
 
-LIBRARY_SOURCES=$(wildcard library/*.c)
-LIBRARY_HEADERS=$(wildcard library/*.h)
-USER_SOURCES=$(wildcard user/*.c)
-USER_PROGRAMS=$(USER_SOURCES:c=exe)
-KERNEL_SOURCES=$(wildcard kernel/*.[chS])
-WORDS=/usr/share/dict/words
+# These settings select the native compiler,
+# which is likely to work on native linux-x86.
+#
+CC=gcc -m32
+LD=ld -melf_i386
+#LD=ld -arch i386
+AR=ar
+OBJCOPY=objcopy -R .note.gnu.property
+ISOGEN=genisoimage
 
-.PHONY: build-kernel build-library build-userspace build-cdrom-image
+# If you are compiling from another platform,
+# then use the script build-cross-compiler.sh
+# add cross/bin to your path, and uncomment these lines:
+#CC=i686-elf-gcc
+#LD=i686-elf-ld
+#AR=i686-elf-ar
+#OBJCOPY=i686-elf-objcopy
 
-all: build-cdrom-image
-
-build-kernel: kernel/basekernel.img
-
-build-library: library/baselib.a
-
-build-userspace: $(USER_PROGRAMS)
-
-build-cdrom-image: basekernel.iso
-
-kernel/basekernel.img: $(KERNEL_SOURCES) $(LIBRARY_HEADERS)
-	cd kernel && make
-
-library/baselib.a: $(LIBRARY_SOURCES) $(LIBRARY_HEADERS)
-	cd library && make
-
-$(USER_PROGRAMS): $(USER_SOURCES) library/baselib.a $(LIBRARY_HEADERS)
-	cd user && make
-
-image: kernel/basekernel.img $(USER_PROGRAMS)
-	rm -rf image
-	mkdir image image/boot image/bin image/data
-	cp kernel/basekernel.img image/boot
-	cp $(USER_PROGRAMS) image/bin
-	if [ -f ${WORDS} ]; then head -2000 ${WORDS} > image/data/words; fi
-
-basekernel.iso: image
-	${ISOGEN} -input-charset utf-8 -iso-level 2 -J -R -o $@ -b boot/basekernel.img image
-
-disk.img:
-	qemu-img create disk.img 10M
-
-run: basekernel.iso disk.img
-	qemu-system-i386 -cdrom basekernel.iso -hda disk.img
-
-debug: basekernel.iso disk.img
-	qemu-system-i386 -cdrom basekernel.iso -hda disk.img -s -S &
-
-clean:
-	rm -rf basekernel.iso image disk.img
-	cd kernel && make clean
-	cd library && make clean
-	cd user && make clean
+# If building on OSX, then install mkisofs via ports or brew
+# and uncomment this:
+#ISOGEN=mkisofs