Include path fix

3 years ago · 205fcb9b80
parent 4413465edf
commit 205fcb9b80
4 changed files with 12 additions and 12 deletions
--- a/4
+++ b/4
@ -1,9 +1,9 @@
 all: os-image

 run: all
-	qemu bin/os-image
+	qemu-system-x86_64 bin/os-image

-os-image: bin/bootloader.bin bin/kernel.bin
+os-image: bootloader.bin kernel.bin
 	cat $^ > bin/os-image

 kernel.bin: bin/kernel_entry.o bin/kernel.o
--- a/src/bootloader/bios.asm
+++ b/src/bootloader/bios.asm
@ -1,7 +1,7 @@
 ; EQUs
-%include "equ/bios.asm"
+%include "src/bootloader/equ/bios.asm"

 ; SRs
-%include "bios/convert.asm"
-%include "bios/print.asm"
-%include "bios/disk.asm"
+%include "src/bootloader/bios/convert.asm"
+%include "src/bootloader/bios/print.asm"
+%include "src/bootloader/bios/disk.asm"
--- a/src/bootloader/bootloader.asm
+++ b/src/bootloader/bootloader.asm
@ -20,9 +20,9 @@

 	jmp $  ; inf loop

-%include "equ/ascii.asm"
-%include "bios.asm"
-%include "pm.asm"
+%include "src/bootloader/equ/ascii.asm"
+%include "src/bootloader/bios.asm"
+%include "src/bootloader/pm.asm"

 BEGIN_PM:
 	; Inform of mode switch
--- a/src/bootloader/pm.asm
+++ b/src/bootloader/pm.asm
@ -1,9 +1,9 @@
 ; Utils
-%include "equ/vga.asm" 
-%include "pm/vga/print.asm" 
+%include "src/bootloader/equ/vga.asm" 
+%include "src/bootloader/pm/vga/print.asm" 

 ; GDT & switching to PM
-%include "pm/gdt.asm" 	; GDT defined here
+%include "src/bootloader/pm/gdt.asm" 	; GDT defined here

 ; Switching to PM
 [bits 16]