diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2017-06-21 14:25:13 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2017-06-21 14:25:13 +0200 |
| commit | e158c4832aa1d5dc8603fb9c33cac3f7cc19abc9 (patch) | |
| tree | 0055162852966fab10afb7a230744796007a9c2f /src/Makefile | |
| parent | 32f14fa04237963d8b6016d8cc0c6d853e68d2fe (diff) | |
| download | abaos-e158c4832aa1d5dc8603fb9c33cac3f7cc19abc9.tar.gz abaos-e158c4832aa1d5dc8603fb9c33cac3f7cc19abc9.tar.bz2 | |
added the widget and the composite widget classes
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile index 497a0d4..02ab439 100644 --- a/src/Makefile +++ b/src/Makefile @@ -11,16 +11,16 @@ all: image.bin kernel.sym # truncate to correct number of sectors, we have # 512 (boot, stage 1) + N * 512 (N currenty is 5, stage 2) for boot.bin -# + M * 512 (M is currently 159) for kernel.bin +# + M * 512 (M is currently 169) for kernel.bin # (M + N + 1 is the number of sectors to be read in stage 2, as stage 1 # loads only the first sector, and stage 1 loads 5 sectors of stage 2, -# adapt NOF_LOAD_SECTORS to 159) +# adapt NOF_LOAD_SECTORS to 169) # then we make sure the image has the size of a 1.44 MB floppy # (emulators like qemu do some guess work for CHS resolution based # on the size of the image) image.bin: boot.bin kernel.bin magic.bin cat boot.bin kernel.bin > image.tmp - truncate -s 83968 image.tmp + truncate -s 89088 image.tmp cat image.tmp magic.bin > image.bin truncate -s 1474560 image.bin @@ -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 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 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,7 @@ 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/widget.o gui/composite_widget.o magic.bin: boot/magic.asm $(NASM) boot/magic.asm -DMAGIC='"$(MAGIC)"' -f bin -o magic.bin @@ -106,6 +106,9 @@ libc/setjmp.o: libc/setjmp.asm gui/widget.o: gui/widget.c gui/widget.h $(CC) $(CFLAGS) -c -o gui/widget.o gui/widget.c +gui/composite_widget.o: gui/composite_widget.c gui/composite_widget.h + $(CC) $(CFLAGS) -c -o gui/composite_widget.o gui/composite_widget.c + clean: -rm -f boot.bin kernel.bin kernel.sym kernel.elf image.bin magic.bin boot.map image.tmp \ serial.log \ |