all repos — mgba @ 67e31c9666531c99aa7625c2ef009b39ae4bb49e

mGBA Game Boy Advance Emulator

Third-Party: Move third-party to src/third-party
Jeffrey Pfau jeffrey@endrift.com
Mon, 03 Nov 2014 23:32:18 -0800
commit

67e31c9666531c99aa7625c2ef009b39ae4bb49e

parent

72136951bf88d767a8ff0fd8050242191dcc4092

6 files changed, 2 insertions(+), 3 deletions(-)

jump to
M CMakeLists.txt → 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)
M src/util/configuration.c → src/util/configuration.c 
@@ -2,7 +2,7 @@ #include "configuration.h"
 
 #include "util/vfs.h"
 
-#include "inih/ini.h"
+#include "third-party/inih/ini.h"
 
 static void _sectionDeinit(void* string) {
 	free(string);