From a9f29cfe168f634434047b55ab16b760e9020680 Mon Sep 17 00:00:00 2001 From: Aleksa Vučković Date: Wed, 6 Oct 2021 23:32:15 +0200 Subject: newlines and scrolling --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f3f5b47..56ffd05 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +SOURCE_DIR=src BUILD_DIR=build ISO_DIR=isodir @@ -6,20 +7,20 @@ all: $(BUILD_DIR)/myos.bin grub-file --is-x86-multiboot $(BUILD_DIR)/myos.bin mkdir -p $(ISO_DIR)/boot/grub cp $(BUILD_DIR)/myos.bin $(ISO_DIR)/boot/myos.bin - cp grub.cfg $(ISO_DIR)/boot/grub/grub.cfg + cp $(SOURCE_DIR)/grub.cfg $(ISO_DIR)/boot/grub/grub.cfg grub-mkrescue -o myos.iso $(ISO_DIR) -$(BUILD_DIR)/boot.o: boot.s +$(BUILD_DIR)/boot.o: $(SOURCE_DIR)/boot.s mkdir -p $(BUILD_DIR) - i686-elf-as boot.s -o $(BUILD_DIR)/boot.o + i686-elf-as $(SOURCE_DIR)/boot.s -o $(BUILD_DIR)/boot.o -$(BUILD_DIR)/kernel.o: kernel.c +$(BUILD_DIR)/kernel.o: $(SOURCE_DIR)/kernel.c mkdir -p $(BUILD_DIR) - i686-elf-gcc -c kernel.c -o $(BUILD_DIR)/kernel.o -std=gnu99 -ffreestanding -O2 -Wall -Wextra + i686-elf-gcc -c $(SOURCE_DIR)/kernel.c -o $(BUILD_DIR)/kernel.o -std=gnu99 -ffreestanding -O2 -Wall -Wextra $(BUILD_DIR)/myos.bin: $(BUILD_DIR)/kernel.o $(BUILD_DIR)/boot.o mkdir -p $(BUILD_DIR) - i686-elf-gcc -T linker.ld -o $(BUILD_DIR)/myos.bin -ffreestanding -O2 -nostdlib $(BUILD_DIR)/boot.o $(BUILD_DIR)/kernel.o -lgcc + i686-elf-gcc -T $(SOURCE_DIR)/linker.ld -o $(BUILD_DIR)/myos.bin -ffreestanding -O2 -nostdlib $(BUILD_DIR)/boot.o $(BUILD_DIR)/kernel.o -lgcc .PHONY: clean clean: -- cgit v1.2.3