aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorArslaan Pathan <[email protected]>2026-03-19 18:04:48 +1300
committerArslaan Pathan <[email protected]>2026-03-19 18:04:48 +1300
commit1814057050a5099d7eaa6f0f6395a4054801da6f (patch)
tree3395c597b100fbe9c53fee9789cc1b016b4b21d4 /Makefile
parent0896c87140db479a5663d40a98c16dafc3d26b67 (diff)
downloadFrenchToastOS-1814057050a5099d7eaa6f0f6395a4054801da6f.tar.xz
FrenchToastOS-1814057050a5099d7eaa6f0f6395a4054801da6f.zip
Fix wrong section (text instead of .text, oops) for entrypoint, change 1M alignment back to 2M, make docker scripts work because arm
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 12 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 5920b1b..769f738 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
-CC = i686-elf-gcc
-AS = i686-elf-as
+CC = i386-elf-gcc
+AS = i386-elf-as
CFLAGS = -std=gnu99 -ffreestanding -O2 -Wall -Wextra
SRCS = src/kernel.c
OBJS = src/boot.o src/kernel.o
-all: FrenchToastOS.iso
+all: FrenchToastOS-bios.iso FrenchToastOS-efi.iso
src/boot.o: src/boot.s
$(AS) src/boot.s -o src/boot.o
@@ -16,12 +16,18 @@ src/kernel.o: src/kernel.c
FrenchToastOS.bin: $(OBJS)
$(CC) -T linker.ld -o FrenchToastOS.bin -ffreestanding -O2 -nostdlib $(OBJS) -lgcc
-FrenchToastOS.iso: FrenchToastOS.bin
+iso-files: FrenchToastOS.bin
mkdir -p isodir/boot/grub
cp FrenchToastOS.bin isodir/boot/
cp boot/grub.cfg isodir/boot/grub/
- grub-mkrescue -o FrenchToastOS.iso isodir
+
+
+FrenchToastOS-bios.iso: iso-files
+ grub-mkrescue /usr/lib/grub/i386-pc -o FrenchToastOS-bios.iso isodir
+
+FrenchToastOS-efi.iso: iso-files
+ grub-mkrescue -o FrenchToastOS-efi.iso isodir
clean:
- rm -f $(OBJS) FrenchToastOS.bin FrenchToastOS.iso
+ rm -f $(OBJS) FrenchToastOS.bin FrenchToastOS-bios.iso FrenchToastOS-efi.iso
rm -rf isodir