diff options
| -rw-r--r-- | Makefile | 52 | ||||
| -rw-r--r-- | apps/Makefile | 19 | ||||
| -rw-r--r-- | src/Makefile | 46 |
3 files changed, 69 insertions, 48 deletions
@@ -1,54 +1,10 @@ # MIT License, Copyright (c) 2020 Marvin Borner -COBJS_KERNEL = src/main.o \ - src/drivers/vesa.o \ - src/drivers/cpu.o \ - src/drivers/serial.o \ - src/drivers/interrupts.o \ - src/drivers/interrupts_asm.o \ - src/drivers/keyboard.o \ - src/drivers/ide.o \ - src/drivers/timer.o \ - src/features/fs.o \ - src/features/psf.o \ - src/features/gui.o \ - src/features/load.o \ - src/lib/str.o \ - src/lib/mem.o \ - src/lib/math.o \ - src/lib/conv.o \ - src/lib/print.o -CC = cross/opt/bin/i686-elf-gcc -LD = cross/opt/bin/i686-elf-ld -OC = cross/opt/bin/i686-elf-objcopy -AS = nasm - -# Flags to make the binary smaller TODO: Remove after indirect pointer support! -CSFLAGS = -mpreferred-stack-boundary=2 -fno-asynchronous-unwind-tables -Os - -# TODO: Use lib as external library -CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Isrc/lib/inc/ -Isrc/inc/ - -ASFLAGS = -f elf32 -O3 - all: compile clean -%.o: %.c - @$(CC) -c $(CFLAGS) $< -o $@ - -%_asm.o: %.asm - @$(AS) $(ASFLAGS) $< -o $@ - -kernel: $(COBJS_KERNEL) - -compile: kernel - @mkdir -p build/ - @$(AS) -f bin src/entry.asm -o build/boot.bin - @$(LD) -N -emain -Ttext 0x00050000 -o build/kernel.bin $(COBJS_KERNEL) --oformat binary - @$(CC) $(CFLAGS) -o build/debug.o $(COBJS_KERNEL) - @$(CC) $(CFLAGS) -fPIE -c apps/test.c -o build/test.o - @$(LD) -o build/test.elf -Tapps/link.ld build/test.o - @$(OC) -O binary build/test.elf build/test +compile: + @$(MAKE) --no-print-directory -C src/ + @$(MAKE) --no-print-directory -C apps/ clean: - @find src/ apps/ -name "*.o" -type f -delete + @find src/ apps/ \( -name "*.o" -or -name "*.elf" \) -type f -delete diff --git a/apps/Makefile b/apps/Makefile new file mode 100644 index 0000000..16f108a --- /dev/null +++ b/apps/Makefile @@ -0,0 +1,19 @@ +# MIT License, Copyright (c) 2020 Marvin Borner + +COBJS = test.o +CC = ../cross/opt/bin/i686-elf-gcc +LD = ../cross/opt/bin/i686-elf-ld +OC = ../cross/opt/bin/i686-elf-objcopy + +# TODO: Fix crash without optimizations +CSFLAGS = -mpreferred-stack-boundary=2 -fno-asynchronous-unwind-tables -Os + +CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -I../src/lib/inc/ -fPIE -Os + +all: $(COBJS) + +%.o: %.c + @mkdir -p ../build/ + @$(CC) -c $(CFLAGS) $< -o $@ + @$(LD) -o $(@:.o=.elf) -Tlink.ld $@ + @$(OC) -O binary $(@:.o=.elf) ../build/$(@:.o=) diff --git a/src/Makefile b/src/Makefile new file mode 100644 index 0000000..475d792 --- /dev/null +++ b/src/Makefile @@ -0,0 +1,46 @@ +# MIT License, Copyright (c) 2020 Marvin Borner + +COBJS = main.o \ + drivers/vesa.o \ + drivers/cpu.o \ + drivers/serial.o \ + drivers/interrupts.o \ + drivers/interrupts_asm.o \ + drivers/keyboard.o \ + drivers/ide.o \ + drivers/timer.o \ + features/fs.o \ + features/psf.o \ + features/gui.o \ + features/load.o \ + lib/str.o \ + lib/mem.o \ + lib/math.o \ + lib/conv.o \ + lib/print.o +CC = ../cross/opt/bin/i686-elf-gcc +LD = ../cross/opt/bin/i686-elf-ld +OC = ../cross/opt/bin/i686-elf-objcopy +AS = nasm + +# Flags to make the binary smaller TODO: Remove after indirect pointer support! +CSFLAGS = -mpreferred-stack-boundary=2 -fno-asynchronous-unwind-tables -Os + +# TODO: Use lib as external library +CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Ilib/inc/ -Iinc/ + +ASFLAGS = -f elf32 -O3 + +all: compile + +%.o: %.c + @$(CC) -c $(CFLAGS) $< -o $@ + +%_asm.o: %.asm + @$(AS) $(ASFLAGS) $< -o $@ + +compile: $(COBJS) + @mkdir -p ../build/ + @$(AS) -f bin entry.asm -o ../build/boot.bin + @$(LD) -N -emain -Ttext 0x00050000 -o ../build/kernel.bin $(COBJS) --oformat binary + @$(CC) $(CFLAGS) -o ../build/debug.o $(COBJS) |