diff options
| author | Tsuda Kageyu <tsuda.kageyu@gmail.com> | 2017-06-09 08:53:10 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-09 08:53:10 +0900 |
| commit | 48d8c0a808e80f14479e5ef1e000f50ae5fe7cac (patch) | |
| tree | c2af59e2d863d7fe668212f0c0e25a2d22ac17db | |
| parent | 3795f277fb2097b0c94f3ea282fb417f9664a2e4 (diff) | |
| parent | 14af861d24352d555eb327fe2f338283a112bab9 (diff) | |
Merge pull request #823 from TsudaKageyu/isolate-3rdparty-lib
Isolate 3rdparty library for easier maintenance.
| -rw-r--r-- | 3rdparty/utf8-cpp/checked.h (renamed from taglib/toolkit/utf8/checked.h) | 0 | ||||
| -rw-r--r-- | 3rdparty/utf8-cpp/core.h (renamed from taglib/toolkit/utf8/core.h) | 0 | ||||
| -rw-r--r-- | taglib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | taglib/toolkit/tstring.cpp | 3 |
4 files changed, 3 insertions, 1 deletions
diff --git a/taglib/toolkit/utf8/checked.h b/3rdparty/utf8-cpp/checked.h index 2aef5838..2aef5838 100644 --- a/taglib/toolkit/utf8/checked.h +++ b/3rdparty/utf8-cpp/checked.h diff --git a/taglib/toolkit/utf8/core.h b/3rdparty/utf8-cpp/core.h index ae0f367d..ae0f367d 100644 --- a/taglib/toolkit/utf8/core.h +++ b/3rdparty/utf8-cpp/core.h diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt index a596ca5b..25041d25 100644 --- a/taglib/CMakeLists.txt +++ b/taglib/CMakeLists.txt @@ -24,6 +24,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/s3m ${CMAKE_CURRENT_SOURCE_DIR}/it ${CMAKE_CURRENT_SOURCE_DIR}/xm + ${CMAKE_SOURCE_DIR}/3rdparty ) if(ZLIB_FOUND) diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp index b26e02fa..c60a3e2e 100644 --- a/taglib/toolkit/tstring.cpp +++ b/taglib/toolkit/tstring.cpp @@ -26,11 +26,12 @@ #include <cerrno> #include <climits> +#include <utf8-cpp/checked.h> + #include <tdebug.h> #include <tstringlist.h> #include <trefcounter.h> #include <tutils.h> -#include <utf8/checked.h> #include "tstring.h" |