From c24c18d7698bca866d88f1b78cc9fbc95b34c32e Mon Sep 17 00:00:00 2001 From: Kouya Heika Date: Thu, 23 Apr 2026 04:54:12 -0500 Subject: [PATCH] Add inih submodule, build with project, update CMake to reflect changes --- .gitmodules | 3 +++ CMakeLists.txt | 12 +----------- deps/inih | 1 + 3 files changed, 5 insertions(+), 11 deletions(-) create mode 160000 deps/inih diff --git a/.gitmodules b/.gitmodules index 9d78ede..4e4f79e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "deps/vector"] path = deps/vector url = https://github.com/goldsborough/vector.git +[submodule "deps/inih"] + path = deps/inih + url = https://github.com/benhoyt/inih.git \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index d595d53..3140673 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,32 +18,24 @@ find_package(PkgConfig QUIET) add_executable(${PROJECT_NAME} src/main.c + deps/inih/ini.c deps/vector/vector.c ) if(PkgConfig_FOUND) - pkg_check_modules(INIH REQUIRED inih) pkg_check_modules(MICROHTTPD REQUIRED libmicrohttpd) pkg_check_modules(MXML REQUIRED mxml) target_include_directories(${PROJECT_NAME} PRIVATE - ${INIH_INCLUDE_DIRS} ${MICROHTTPD_INCLUDE_DIRS} ${MXML_INCLUDE_DIRS} ) target_link_libraries(${PROJECT_NAME} PRIVATE - ${INIH_LIBRARIES} ${MICROHTTPD_LIBRARIES} ${MXML_LIBRARIES} ) else() - find_path(INIH_INCLUDE_DIR ini.h) - find_library(INIH_LIBRARY NAMES inih libinih) - if(NOT INIH_INCLUDE_DIR OR NOT INIH_LIBRARY) - message(FATAL_ERROR "inih not found") - endif() - find_path(MICROHTTPD_INCLUDE_DIR microhttpd.h) find_library(MICROHTTPD_LIBRARY NAMES microhttpd libmicrohttpd) if(NOT MICROHTTPD_INCLUDE_DIR OR NOT MICROHTTPD_LIBRARY) @@ -57,13 +49,11 @@ else() endif() target_include_directories(${PROJECT_NAME} PRIVATE - ${INIH_INCLUDE_DIR} ${MICROHTTPD_INCLUDE_DIR} ${MXML_INCLUDE_DIR} ) target_link_libraries(${PROJECT_NAME} PRIVATE - ${INIH_LIBRARY} ${MICROHTTPD_LIBRARY} ${MXML_LIBRARY} ) diff --git a/deps/inih b/deps/inih new file mode 160000 index 0000000..577ae2d --- /dev/null +++ b/deps/inih @@ -0,0 +1 @@ +Subproject commit 577ae2dee1f0d9c2d11c7f10375c1715f3d6940c