From: Amelia Coutard Date: Sat, 25 Feb 2023 15:08:23 +0000 (+0100) Subject: Moved some source files to a `lib` directory. X-Git-Url: https://git.ameliathe1st.gay/?a=commitdiff_plain;h=5a75d74d702978d4384e0467835258875005457b;p=voyage-au-centre-des-fichiers.git Moved some source files to a `lib` directory. --- diff --git a/kernel/module.mk b/kernel/module.mk index 9c1ed20..d503c39 100644 --- a/kernel/module.mk +++ b/kernel/module.mk @@ -24,10 +24,10 @@ LDFLAGS := $(OLD_LDFLAGS) -T kernel/linker.ld -z max-page-size=0x1000 \ CPPOBJS := $(patsubst $(SRC_DIR)%,$(OUT_DIR)%.o,$(shell find $(SRC_DIR) -name '*.cpp')) ASMOBJS := $(patsubst $(SRC_DIR)%,$(OUT_DIR)%.o,$(shell find $(SRC_DIR) -name '*.S' | grep -v crt)) -CRTI_OBJ := $(OUT_DIR)crti.S.o +CRTI_OBJ := $(OUT_DIR)/lib/crti.S.o CRTBEGIN_OBJ := $(shell $(CXX) $(LDFLAGS) -print-file-name=crtbegin.o) CRTEND_OBJ := $(shell $(CXX) $(LDFLAGS) -print-file-name=crtend.o) -CRTN_OBJ := $(OUT_DIR)crtn.S.o +CRTN_OBJ := $(OUT_DIR)/lib/crtn.S.o OBJS := $(CRTI_OBJ) $(CRTBEGIN_OBJ) $(CPPOBJS) $(ASMOBJS) $(CRTEND_OBJ) $(CRTN_OBJ) isodir/boot/$(EXEC_NAME): $(OUT_DIR)$(EXEC_NAME) diff --git a/kernel/src/boot.S b/kernel/src/boot.S index cd329af..9b91c17 100644 --- a/kernel/src/boot.S +++ b/kernel/src/boot.S @@ -1,4 +1,4 @@ -#include "multiboot2.hpp" +#include "lib/multiboot2.hpp" .set KERNEL_VMA, 0xFFFFFFFF80000000 diff --git a/kernel/src/interrupts.hpp b/kernel/src/interrupts.hpp index af4cb6d..c405e26 100644 --- a/kernel/src/interrupts.hpp +++ b/kernel/src/interrupts.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "phys_ptr.hpp" +#include "lib/phys_ptr.hpp" #include "serial.hpp" namespace os { diff --git a/kernel/src/kernel.cpp b/kernel/src/kernel.cpp index e786124..998357f 100644 --- a/kernel/src/kernel.cpp +++ b/kernel/src/kernel.cpp @@ -1,4 +1,4 @@ -#include "multiboot2.hpp" +#include "lib/multiboot2.hpp" #include "paging.hpp" #include "utils.hpp" #include "serial.hpp" diff --git a/kernel/src/crti.S b/kernel/src/lib/crti.S similarity index 100% rename from kernel/src/crti.S rename to kernel/src/lib/crti.S diff --git a/kernel/src/crtn.S b/kernel/src/lib/crtn.S similarity index 100% rename from kernel/src/crtn.S rename to kernel/src/lib/crtn.S diff --git a/kernel/src/multiboot2.hpp b/kernel/src/lib/multiboot2.hpp similarity index 100% rename from kernel/src/multiboot2.hpp rename to kernel/src/lib/multiboot2.hpp diff --git a/kernel/src/phys_ptr.hpp b/kernel/src/lib/phys_ptr.hpp similarity index 100% rename from kernel/src/phys_ptr.hpp rename to kernel/src/lib/phys_ptr.hpp diff --git a/kernel/src/paging.hpp b/kernel/src/paging.hpp index ade4bcb..5a2c809 100644 --- a/kernel/src/paging.hpp +++ b/kernel/src/paging.hpp @@ -3,7 +3,7 @@ #include #include "serial.hpp" #include "utils.hpp" -#include "phys_ptr.hpp" +#include "lib/phys_ptr.hpp" namespace os { namespace paging {