aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMarvin Borner2020-07-23 11:56:44 +0200
committerMarvin Borner2020-07-23 11:56:44 +0200
commitfa00718c221b64070067bcd64acbc297e4ac699c (patch)
tree699df63acd31153ade2c2d8a68ceb521dd1dd89a /Makefile
parente7662496ad331266b8fcc0df514523f97cb703e4 (diff)
Well, I need ASM ig.
I've tried to do interrupts without ASM but it doesn't seem to work.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 9c172f4..ecc501e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ COBJS = src/main.o \
src/drivers/cpu.o \
src/drivers/serial.o \
src/drivers/interrupts.o \
+ src/drivers/interrupts_asm.o \
src/drivers/keyboard.o \
src/lib/string.o
CC = cross/opt/bin/i686-elf-gcc
@@ -14,11 +15,16 @@ AS = nasm
# TODO: Use lib as external library
CFLAGS = -Wall -Wextra -nostdlib -nostdinc -ffreestanding -mgeneral-regs-only -mno-80387 -std=c99 -pedantic-errors -Isrc/lib/inc/ -Isrc/inc/ -c
+ASFLAGS = -f elf32
+
all: compile clean
%.o: %.c
$(CC) $(CFLAGS) $< -o $@
+%_asm.o: %.asm
+ $(AS) $(ASFLAGS) $< -o $@
+
kernel: $(COBJS)
compile: kernel