diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | arch/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | arch/x86_64/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | kern/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | kern/include/kern/asm_pointer.hpp (renamed from include/memory/asm_pointer.hpp) | 0 |
5 files changed, 10 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c08753b..a00b043 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,9 +32,8 @@ add_subdirectory("kern") add_subdirectory("arch") target_link_libraries("kernel" PRIVATE - "kern" - "arch::any" "arch::${CMAKE_SYSTEM_PROCESSOR}" + "os::kern" ) # #[============================================================================[ diff --git a/arch/CMakeLists.txt b/arch/CMakeLists.txt index c7b2c15..eded57e 100644 --- a/arch/CMakeLists.txt +++ b/arch/CMakeLists.txt @@ -14,4 +14,8 @@ target_include_directories("arch-any" INTERFACE "include" ) +target_link_libraries("arch-any" INTERFACE + "libs::kstd" +) + add_subdirectory("${CMAKE_SYSTEM_PROCESSOR}") diff --git a/arch/x86_64/CMakeLists.txt b/arch/x86_64/CMakeLists.txt index 19bc78c..dd54b39 100644 --- a/arch/x86_64/CMakeLists.txt +++ b/arch/x86_64/CMakeLists.txt @@ -6,8 +6,7 @@ target_include_directories("arch-x86_64" PUBLIC ) target_link_libraries("arch-x86_64" PUBLIC - "kern" - + "arch::any" "libs::multiboot2" ) diff --git a/kern/CMakeLists.txt b/kern/CMakeLists.txt index 9bfe9e8..52c2cb5 100644 --- a/kern/CMakeLists.txt +++ b/kern/CMakeLists.txt @@ -1,4 +1,7 @@ -add_library("kern" OBJECT +add_library("kern" OBJECT) +add_library("os::kern" ALIAS "kern") + +target_sources("kern" PRIVATE "src/abort.cpp" "src/error.cpp" "src/main.cpp" @@ -11,6 +14,4 @@ target_include_directories("kern" PUBLIC target_link_libraries("kern" PUBLIC "arch::any" - - "gcc" ) diff --git a/include/memory/asm_pointer.hpp b/kern/include/kern/asm_pointer.hpp index 4c25658..4c25658 100644 --- a/include/memory/asm_pointer.hpp +++ b/kern/include/kern/asm_pointer.hpp |