summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2017-06-18 10:57:35 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2017-06-18 10:57:35 +0200
commitc6cdddeff0cb0437b1d54520d99460a58db39fdc (patch)
tree97ce8da5314293a7465e21e63d69904d82fa43af /src/Makefile
parenteace3b5f238e5e4eaf4c2ffcbf741616a0d6a25f (diff)
downloadabaos-c6cdddeff0cb0437b1d54520d99460a58db39fdc.tar.gz
abaos-c6cdddeff0cb0437b1d54520d99460a58db39fdc.tar.bz2
started the widget framework
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile
index 3b1964f..fd418ef 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,5 @@
CC := gcc
-INCLUDES = -I. -Ilibc -Ihardware -Idrivers -Idrivers/hdi -Idrivers/hdi/ps2 -Ikernel
+INCLUDES = -I. -Ilibc -Ihardware -Idrivers -Idrivers/hdi -Idrivers/hdi/ps2 -Ikernel -Igui
CFLAGS := -std=c99 -m32 -ffreestanding -O0 -g -Wall -Werror $(INCLUDES)
LD := ld
NASMFLAGS := -f elf32
@@ -33,7 +33,7 @@ kernel.bin: kernel.elf
kernel.sym: kernel.elf
$(OBJCOPY) --only-keep-debug kernel.elf kernel.sym
-kernel.elf: kernel/kernel.o kernel/kernel_asm.o kernel/console.o kernel/vgatext.o kernel/serial.o hardware/port.o hardware/port_asm.o hardware/interrupts.o hardware/interrupts_asm.o hardware/pci.o drivers/driver.o drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/mouse.o drivers/video/vga.o drivers/video/vga_font.o libc/string.o libc/stdlib.o libc/stdio.o libc/setjmp.o
+kernel.elf: kernel/kernel.o kernel/kernel_asm.o kernel/console.o kernel/vgatext.o kernel/serial.o hardware/port.o hardware/port_asm.o hardware/interrupts.o hardware/interrupts_asm.o hardware/pci.o drivers/driver.o drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/mouse.o drivers/video/vga.o drivers/video/vga_font.o gui/widget.o libc/string.o libc/stdlib.o libc/stdio.o libc/setjmp.o
$(LD) -o kernel.elf -N -n -Ttext 0x8800 --oformat elf32-i386 \
kernel/kernel.o kernel/kernel_asm.o \
kernel/console.o kernel/vgatext.o kernel/serial.o \
@@ -43,7 +43,8 @@ kernel.elf: kernel/kernel.o kernel/kernel_asm.o kernel/console.o kernel/vgatext.
drivers/driver.o \
drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/mouse.o \
drivers/video/vga.o drivers/video/vga_font.o \
- libc/string.o libc/stdlib.o libc/stdio.o libc/setjmp.o
+ libc/string.o libc/stdlib.o libc/stdio.o libc/setjmp.o \
+ gui/widget.o
magic.bin: boot/magic.asm
$(NASM) boot/magic.asm -DMAGIC='"$(MAGIC)"' -f bin -o magic.bin
@@ -102,6 +103,9 @@ libc/stdio.o: libc/stdio.c libc/stdio.h
libc/setjmp.o: libc/setjmp.asm
$(NASM) libc/setjmp.asm $(NASMFLAGS) -o libc/setjmp.o
+gui/widget.o: gui/widget.c gui/widget.h
+ $(CC) $(CFLAGS) -c -o gui/widget.o gui/widget.c
+
clean:
-rm -f boot.bin kernel.bin kernel.sym kernel.elf image.bin magic.bin boot.map image.tmp \
serial.log \