diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2017-06-30 09:10:26 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2017-06-30 09:10:26 +0200 |
| commit | 58df0d3172ad548b85627e5bb0b92a27a6072736 (patch) | |
| tree | 76d621778d30e541ab5bdce539b38bed27833abf /src/Makefile | |
| parent | 587f8d3dbf25408100496854c8803ce3c918ec4f (diff) | |
| download | abaos-58df0d3172ad548b85627e5bb0b92a27a6072736.tar.gz abaos-58df0d3172ad548b85627e5bb0b92a27a6072736.tar.bz2 | |
added a window to gui which is draggable by the mouse
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index c9ccda8..bcb0da7 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 gui/text_widget.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/window.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,8 +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/text_widget.o + gui/widget.o gui/composite_widget.o gui/window.o \ + gui/desktop.o gui/text_widget.o magic.bin: boot/magic.asm $(NASM) boot/magic.asm -DMAGIC='"$(MAGIC)"' -f bin -o magic.bin @@ -110,6 +110,9 @@ gui/widget.o: gui/widget.c gui/widget.h gui/composite_widget.o: gui/composite_widget.c gui/composite_widget.h $(CC) $(CFLAGS) -c -o gui/composite_widget.o gui/composite_widget.c +gui/window.o: gui/window.c gui/window.h + $(CC) $(CFLAGS) -c -o gui/window.o gui/window.c + gui/desktop.o: gui/desktop.c gui/desktop.h $(CC) $(CFLAGS) -c -o gui/desktop.o gui/desktop.c |