diff --git a/Makefile b/Makefile index cacac54..e5c5861 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ CC = i386-elf-gcc LD = i386-elf-ld AS = nasm -CFLAGS = -ffreestanding -m32 -Iinclude -Wall -Wextra +CFLAGS = -ffreestanding -m32 -Iinclude -Wall -Wextra SRC = ./src BUILD = ./build @@ -32,10 +32,10 @@ bootloader: @cat $(BUILD)/stage1.bin $(BUILD)/stage2.bin > $(BUILD)/boot.bin # Kernel: This target is responsible for creating kernel.bin -kernel: $(C_FILES) $(SRC)/entry.asm +kernel: $(SRC)/kernel.c $(SRC)/entry.asm @$(AS) -felf32 -o $(BUILD)/entry.o $(SRC)/entry.asm @$(CC) $(CFLAGS) -o $(BUILD)/kernel.o -c $(SRC)/kernel.c - @$(LD) -Tkernel.ld --oformat binary -o $(BUILD)/kernel.bin $(BUILD)/*.o + @$(LD) -T $(SRC)/kernel.ld --oformat binary -o $(BUILD)/kernel.bin $(BUILD)/*.o # Run QEMU run: diff --git a/other/charset.png b/other/charset.png deleted file mode 100644 index 50f49d9..0000000 Binary files a/other/charset.png and /dev/null differ diff --git a/other/colors.png b/other/colors.png deleted file mode 100644 index ea50634..0000000 Binary files a/other/colors.png and /dev/null differ diff --git a/other/disk.png b/other/disk.png index 9037954..39839e2 100644 Binary files a/other/disk.png and b/other/disk.png differ diff --git a/other/filesystem.png b/other/filesystem.png index 75899b9..6bfc780 100644 Binary files a/other/filesystem.png and b/other/filesystem.png differ diff --git a/other/shell.png b/other/shell.png index 417c068..05e9e83 100644 Binary files a/other/shell.png and b/other/shell.png differ diff --git a/kernel.ld b/src/kernel.ld similarity index 100% rename from kernel.ld rename to src/kernel.ld