diff options
| author | Felix Morgner <felix.morgner@ost.ch> | 2025-12-12 14:26:16 +0100 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@ost.ch> | 2025-12-12 14:26:16 +0100 |
| commit | 4bf9eded3a5d6b007ba79a5716143fa8b3a5aaf6 (patch) | |
| tree | 5ffcfb9b12afd58627a52498f232c798b273a351 | |
| parent | 5f695cd3519d8a09a53485c08971f49ed92969ff (diff) | |
| download | teachos-4bf9eded3a5d6b007ba79a5716143fa8b3a5aaf6.tar.xz teachos-4bf9eded3a5d6b007ba79a5716143fa8b3a5aaf6.zip | |
kapi: move platform independent implementation
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kapi/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/kapi/cio.cpp (renamed from kapi/src/cio.cpp) | 0 | ||||
| -rw-r--r-- | src/kapi/system.cpp (renamed from kapi/src/system.cpp) | 0 |
4 files changed, 7 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c348d0..d973268 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,6 +73,10 @@ add_subdirectory("libs") add_executable("kernel" "src/kstd.cpp" "src/main.cpp" + + # Platform Independent KAPI implementation + "src/kapi/cio.cpp" + "src/kapi/system.cpp" ) target_link_libraries("kernel" PRIVATE diff --git a/kapi/CMakeLists.txt b/kapi/CMakeLists.txt index d0ecb70..e513dba 100644 --- a/kapi/CMakeLists.txt +++ b/kapi/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library("kapi" OBJECT) +add_library("kapi" INTERFACE) add_library("os::kapi" ALIAS "kapi") target_sources("kapi" PUBLIC @@ -16,16 +16,11 @@ target_sources("kapi" PUBLIC "include/kapi/system.hpp" ) -target_sources("kapi" PRIVATE - "src/cio.cpp" - "src/system.cpp" -) - -target_include_directories("kapi" PUBLIC +target_include_directories("kapi" INTERFACE "include" ) -target_link_libraries("kapi" PUBLIC +target_link_libraries("kapi" INTERFACE "libs::kstd" "gcc" diff --git a/kapi/src/cio.cpp b/src/kapi/cio.cpp index 66493b6..66493b6 100644 --- a/kapi/src/cio.cpp +++ b/src/kapi/cio.cpp diff --git a/kapi/src/system.cpp b/src/kapi/system.cpp index 3ae3f29..3ae3f29 100644 --- a/kapi/src/system.cpp +++ b/src/kapi/system.cpp |
