diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2017-06-24 21:16:44 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2017-06-24 21:16:44 +0200 |
| commit | e74065e71667d8df1529f8ca32e14f3e54119ea1 (patch) | |
| tree | d5daa165dd618eda0bf6b8760472a95eefaa80ad /src/Makefile | |
| parent | fd0782099cab0988311aa80d4a6b0871a6403084 (diff) | |
| download | abaos-e74065e71667d8df1529f8ca32e14f3e54119ea1.tar.gz abaos-e74065e71667d8df1529f8ca32e14f3e54119ea1.tar.bz2 | |
started to implement a widget showing text, the problem currently
is the inheritance method in draw is not working correctly
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index d919cbc..c9ccda8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -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 gui/widget.o gui/composite_widget.o gui/desktop.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 gui/composite_widget.o gui/desktop.o gui/text_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 \ @@ -44,7 +44,8 @@ kernel.elf: kernel/kernel.o kernel/kernel_asm.o kernel/console.o kernel/vgatext. 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 \ - gui/widget.o gui/composite_widget.o gui/desktop.o + gui/widget.o gui/composite_widget.o gui/desktop.o \ + gui/text_widget.o magic.bin: boot/magic.asm $(NASM) boot/magic.asm -DMAGIC='"$(MAGIC)"' -f bin -o magic.bin @@ -112,6 +113,9 @@ gui/composite_widget.o: gui/composite_widget.c gui/composite_widget.h gui/desktop.o: gui/desktop.c gui/desktop.h $(CC) $(CFLAGS) -c -o gui/desktop.o gui/desktop.c +gui/text_widget.o: gui/text_widget.c gui/text_widget.h + $(CC) $(CFLAGS) -c -o gui/text_widget.o gui/text_widget.c + clean: -rm -f boot.bin kernel.bin kernel.sym kernel.elf image.bin magic.bin boot.map image.tmp \ serial.log \ |