diff --git a/CMakeLists.txt b/CMakeLists.txt index e107afe5e..7cb5a5b72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ file(GLOB GBA_SRC ${CMAKE_SOURCE_DIR}/src/gba/*.c) file(GLOB UTIL_SRC ${CMAKE_SOURCE_DIR}/src/util/*.[cS]) file(GLOB VFS_SRC ${CMAKE_SOURCE_DIR}/src/util/vfs/*.c) file(GLOB RENDERER_SRC ${CMAKE_SOURCE_DIR}/src/gba/renderers/video-software.c) -file(GLOB THIRD_PARTY_SRC ${CMAKE_SOURCE_DIR}/third-party/inih/*.c) +file(GLOB THIRD_PARTY_SRC ${CMAKE_SOURCE_DIR}/src/third-party/inih/*.c) list(APPEND UTIL_SRC ${CMAKE_SOURCE_DIR}/src/platform/commandline.c) source_group("ARM core" FILES ${ARM_SRC}) source_group("GBA board" FILES ${GBA_SRC} ${RENDERER_SRC}) @@ -23,7 +23,6 @@ source_group("Utilities" FILES ${UTIL_SRC} ${VFS_SRC}}) include_directories(${CMAKE_SOURCE_DIR}/src/arm) include_directories(${CMAKE_SOURCE_DIR}/src/gba) include_directories(${CMAKE_SOURCE_DIR}/src) -include_directories(${CMAKE_SOURCE_DIR}/third-party) include(GNUInstallDirs) diff --git a/third-party/inih/LICENSE.txt b/src/third-party/inih/LICENSE.txt similarity index 100% rename from third-party/inih/LICENSE.txt rename to src/third-party/inih/LICENSE.txt diff --git a/third-party/inih/README.txt b/src/third-party/inih/README.txt similarity index 100% rename from third-party/inih/README.txt rename to src/third-party/inih/README.txt diff --git a/third-party/inih/ini.c b/src/third-party/inih/ini.c similarity index 100% rename from third-party/inih/ini.c rename to src/third-party/inih/ini.c diff --git a/third-party/inih/ini.h b/src/third-party/inih/ini.h similarity index 100% rename from third-party/inih/ini.h rename to src/third-party/inih/ini.h diff --git a/src/util/configuration.c b/src/util/configuration.c index 16a26609c..3671f72da 100644 --- a/src/util/configuration.c +++ b/src/util/configuration.c @@ -2,7 +2,7 @@ #include "util/vfs.h" -#include "inih/ini.h" +#include "third-party/inih/ini.h" static void _sectionDeinit(void* string) { free(string);