From 95c12d0f029d63ede9e0b220af85c0bf2556f7a6 Mon Sep 17 00:00:00 2001 From: sillysagiri Date: Sat, 30 Dec 2023 09:24:41 +0700 Subject: [PATCH] move vendor to cmakelist --- CMakeLists.txt | 14 +++++++++----- encoder/CMakeLists.txt | 12 +++++++++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ed58fc..feb000e 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,26 +10,30 @@ set(NDSTOOL_SUBTITLE1 "Created by sillysagiri" CACHE BOOL "") set(NDSTOOL_SUBTITLE2 "sillysagiri.my.id" CACHE BOOL "") set(NDSTOOL_NITROFS "resource" CACHE BOOL "") -# add_subdirectory(arm9) +message(STATUS "Downloading fastlz library") +include(FetchContent) +FetchContent_Declare(fastlz URL https://git.sillysagiri.my.id/MirrorRepo/FastLZ/archive/master.zip) +FetchContent_MakeAvailable(fastlz) set(NDSTOOL_ARM7 "${CMAKE_BINARY_DIR}/arm7/arm7.elf" CACHE BOOL "") # set(NDSTOOL_ARM9 arm9 CACHE BOOL "") project(${PROJECT_NAME}) -file(GLOB_RECURSE PROJECT_SOURCES CONFIGURE_DEPENDS "src/*.cpp") -file(GLOB VENDOR_SOURCES CONFIGURE_DEPENDS "vendor/FastLZ/fastlz.c") +file(GLOB_RECURSE PROJECT_SOURCES CONFIGURE_DEPENDS + "src/*.cpp" + ${fastlz_SOURCE_DIR}/fastlz.c) set(PROJECT_INCLUDE "src" - "vendor/FastLZ") + ${fastlz_SOURCE_DIR}) set(PROJECT_VENDOR "filesystem" "fat" "mm9") -add_executable(${PROJECT_NAME} ${PROJECT_SOURCES} ${VENDOR_SOURCES}) +add_executable(${PROJECT_NAME} ${PROJECT_SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_INCLUDE}) target_link_libraries(${PROJECT_NAME} PUBLIC ${PROJECT_VENDOR}) diff --git a/encoder/CMakeLists.txt b/encoder/CMakeLists.txt index d803610..9c4ee00 100644 --- a/encoder/CMakeLists.txt +++ b/encoder/CMakeLists.txt @@ -7,12 +7,18 @@ set(PROJECT_NAME "encoder") project(${PROJECT_NAME}) -file(GLOB_RECURSE PROJECT_SOURCES CONFIGURE_DEPENDS "*.cpp" "*.c") -file(GLOB VENDOR_SOURCES CONFIGURE_DEPENDS "../vendor/FastLZ/fastlz.c") +message(STATUS "Downloading fastlz library") +include(FetchContent) +FetchContent_Declare(fastlz URL https://git.sillysagiri.my.id/MirrorRepo/FastLZ/archive/master.zip) +FetchContent_MakeAvailable(fastlz) + +file(GLOB_RECURSE PROJECT_SOURCES CONFIGURE_DEPENDS + "*.cpp" "*.c" + ${fastlz_SOURCE_DIR}/fastlz.c) set(PROJECT_INCLUDE "encoder" - "../vendor/FastLZ") + ${fastlz_SOURCE_DIR}) set(PROJECT_VENDOR "")