aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorArslaan Pathan <[email protected]>2026-03-17 21:43:31 +1300
committerArslaan Pathan <[email protected]>2026-03-17 21:43:31 +1300
commit94b61705a911aebb090ff3e1a760ad4dbeecd0c6 (patch)
tree8247f6b9e81e7bcfcb6a96f831d626f8acbd839b /Makefile
parent6135c121ced6d4879a30cc7a6a5bed1a2d0975cd (diff)
downloadFrenchToastOS-94b61705a911aebb090ff3e1a760ad4dbeecd0c6.tar.xz
FrenchToastOS-94b61705a911aebb090ff3e1a760ad4dbeecd0c6.zip
A few things
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index dee9099..5920b1b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
CC = i686-elf-gcc
-AS = nasm
+AS = i686-elf-as
CFLAGS = -std=gnu99 -ffreestanding -O2 -Wall -Wextra
SRCS = src/kernel.c
@@ -7,8 +7,8 @@ OBJS = src/boot.o src/kernel.o
all: FrenchToastOS.iso
-src/boot.o: src/boot.asm
- $(AS) -f elf32 src/boot.asm -o src/boot.o
+src/boot.o: src/boot.s
+ $(AS) src/boot.s -o src/boot.o
src/kernel.o: src/kernel.c
$(CC) $(CFLAGS) -c src/kernel.c -o src/kernel.o