From 958e2dae042ca9e28f23e509d541730f30fa8502 Mon Sep 17 00:00:00 2001
From: Loic Guegan <manzerbredes@mailbox.org>
Date: Thu, 8 Apr 2021 13:07:17 +0200
Subject: Switch to multiboot2 and improve interrupt management

---
 src/Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index b95e38d..28081af 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,6 @@
 EXEC := bringelle
 CC := gcc -c -m32 -fno-pie -fno-builtin -fno-stack-protector
+LD_SCRIPT := linker.ld
 
 # Note that BOOT_OBJ do not match boot.S
 # Indeed boot.o generated by boot.S should appear
@@ -10,19 +11,19 @@ UTILS_OBJ := $(addsuffix .o,$(basename $(shell find ./utils -name "*.[c|S]")))
 all: $(EXEC)
 
 $(EXEC): boot/boot.o $(UTILS_OBJ) bringelle.o
-	ld -Ttext=0x00100000 -melf_i386 -nostdlib --oformat=binary -o bringelle $^ 
+	ld -n -T $(LD_SCRIPT) -nostdlib -o bringelle $^ 
 
 %.o: %.S
 	as --32 -o $@ $^ -mx86-used-note=no
 
 %.o: %.c
 	$(CC) -o $@ $<
-	objcopy --remove-section .note.gnu.property $@
-
+	#objcopy --remove-section .note.gnu.property $@
+	
 clean:
 	rm -f $(EXEC)
 	find ./ -name "*.o" -delete
 
-.PHONY: clean
+.PHONY: clean cdrom
 
 
-- 
cgit v1.2.3