diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index b0c323a..0000000 --- a/.gitmodules +++ /dev/null @@ -1,9 +0,0 @@ -[submodule "external/SnLogger"] - path = external/SnLogger - url = https://github.com/kshku/SnLogger.git -[submodule "external/SnMemory"] - path = external/SnMemory - url = https://github.com/kshku/SnMemory.git -[submodule "external/SnFile"] - path = external/SnFile - url = https://github.com/kshku/SnFile.git diff --git a/CMakeLists.txt b/CMakeLists.txt index b46aca5..88c1788 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,30 @@ target_compile_definitions(snuk_configs INTERFACE option(SNUK_BUILD_SHARED "Build shared library" OFF) -add_subdirectory(external) +include(FetchContent) + +FetchContent_Declare( + snlogger + GIT_REPOSITORY https://github.com/kshku/SnLogger.git + GIT_TAG main +) +FetchContent_MakeAvailable(snlogger) + +FetchContent_Declare( + snfile + GIT_REPOSITORY https://github.com/kshku/SnFile.git + GIT_TAG main +) +FetchContent_MakeAvailable(snfile) + +FetchContent_Declare( + snmemory + GIT_REPOSITORY https://github.com/kshku/SnMemory.git + GIT_TAG main +) + +target_link_libraries(snuk_configs INTERFACE snlogger snfile snmemory) + add_subdirectory(docs) add_subdirectory(src) add_subdirectory(repl) diff --git a/external/SnFile b/external/SnFile deleted file mode 160000 index 993e294..0000000 --- a/external/SnFile +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 993e2944f5f2c4b09f52f5c11d663fa5eb06fcbd diff --git a/external/SnLogger b/external/SnLogger deleted file mode 160000 index 534235d..0000000 --- a/external/SnLogger +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 534235d7d483f589ebc08410e6c2b379d3634cc2 diff --git a/external/SnMemory b/external/SnMemory deleted file mode 160000 index b0e1d57..0000000 --- a/external/SnMemory +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b0e1d578c19c6819f243ee75353295f69a9d79da diff --git a/src/memory.c b/src/memory.c index dc11e82..14d0d8a 100644 --- a/src/memory.c +++ b/src/memory.c @@ -74,7 +74,7 @@ void snuk_free(void *ptr) { static bool create_allocator(SnukPageAllocator *allocator, uint32_t pages) { *allocator = (SnukPageAllocator){ - .base = sn_vm_reserve(pages), + .base = sn_vm_reserve(NULL, pages), .total_pages = pages, .committed_pages = 0, .reverse_committed_pages = 0,