From f90c075d5061b3a89316d6bf3d5b190d49049ccd Mon Sep 17 00:00:00 2001 From: Brett Weiland Date: Wed, 24 Mar 2021 15:42:20 -0500 Subject: renamed: kernel/include/acpi.h -> include/acpi.h renamed: kernel/include/libc.h -> include/libc.h renamed: kernel/include/paging.h -> include/paging.h renamed: kernel/include/printf.h -> include/printf.h renamed: kernel/include/serial.h -> include/serial.h renamed: kernel/include/video.h -> include/video.h new file: indigo_os renamed: kernel/libs/acpi.c -> kernel/acpi.c renamed: kernel/libs/drivers/serial.c -> kernel/drivers/serial.c renamed: kernel/libs/drivers/video.c -> kernel/drivers/video.c renamed: kernel/libs/libc.c -> kernel/libc.c renamed: kernel/libs/page.c -> kernel/page.c renamed: kernel/libs/printf.c -> kernel/printf.c renamed: kernel/libs/printf.h -> kernel/printf.h modified: makefile --- src/makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/makefile') diff --git a/src/makefile b/src/makefile index 5e8acb7..4e51ff4 100644 --- a/src/makefile +++ b/src/makefile @@ -1,7 +1,7 @@ LD=../compiler/indigo_gcc/bin/x86_64-elf-ld CC=../compiler/indigo_gcc/bin/x86_64-elf-gcc OBJCPY=../compiler/indigo_gcc/bin/x86_64-elf-objcopy -INC=-Ikernel/include +INC=-I./include EMU_CORES=4 EMU_RAM=4G @@ -12,12 +12,12 @@ YRES=768 make: nasm -g -felf64 bootloader/bootloader.asm -o objects/bootloader.o $(CC) $(INC) -g -ffreestanding -c kernel/kernel.c -o objects/kernel.o - $(CC) $(INC) -g -ffreestanding -c kernel/libs/acpi.c -o objects/acpi.o - $(CC) $(INC) -g -ffreestanding -c kernel/libs/drivers/serial.c -o objects/serial.o - $(CC) $(INC) -g -ffreestanding -c kernel/libs/drivers/video.c -o objects/video.o - $(CC) $(INC) -g -ffreestanding -c kernel/libs/printf.c -o objects/printf.o - $(CC) $(INC) -g -ffreestanding -c kernel/libs/page.c -o objects/page.o - $(CC) $(INC) -g -ffreestanding -c kernel/libs/libc.c -o objects/libc.o + $(CC) $(INC) -g -ffreestanding -c kernel/acpi.c -o objects/acpi.o + $(CC) $(INC) -g -ffreestanding -c kernel/drivers/serial.c -o objects/serial.o + $(CC) $(INC) -g -ffreestanding -c kernel/drivers/video.c -o objects/video.o + $(CC) $(INC) -g -ffreestanding -c kernel/printf.c -o objects/printf.o + $(CC) $(INC) -g -ffreestanding -c kernel/page.c -o objects/page.o + $(CC) $(INC) -g -ffreestanding -c kernel/libc.c -o objects/libc.o $(LD) -o indigo_os.elf --oformat=elf64-x86-64 -T link.ld $(OBJCPY) --only-keep-debug indigo_os.elf debug/debug_syms.o $(OBJCPY) -O binary --strip-all indigo_os.elf indigo_os -- cgit v1.2.3