blob: b773381ec8ef6a1ab5f934ced390d2402e72e5e3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
set(WITH_ZLIB OFF)
set(BUILD_TESTING OFF)
-add_subdirectory(taglib)
if(MSVC)
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/execution-charset:utf-8>")
@@ -64,10 +63,6 @@ set_target_properties(ncmdump_exec PROPERTIES OUTPUT_NAME "ncmdump")
target_include_directories(ncmdump_exec PRIVATE src/include)
target_link_libraries(ncmdump_exec tag)
-target_include_directories(ncmdump_exec PRIVATE taglib)
-target_include_directories(ncmdump_exec PRIVATE taglib/taglib)
-target_include_directories(ncmdump_exec PRIVATE taglib/taglib/toolkit)
-target_include_directories(ncmdump_exec PRIVATE taglib/taglib/mpeg/id3v2)
include(GNUInstallDirs)
--- a/src/ncmcrypt.cpp
+++ b/src/ncmcrypt.cpp
@@ -4,11 +4,11 @@
#include "cJSON.h"
#define TAGLIB_STATIC
-#include "taglib/toolkit/tfile.h"
-#include "taglib/mpeg/mpegfile.h"
-#include "taglib/flac/flacfile.h"
-#include "taglib/mpeg/id3v2/frames/attachedpictureframe.h"
-#include "taglib/mpeg/id3v2/id3v2tag.h"
+#include "taglib/tfile.h"
+#include "taglib/mpegfile.h"
+#include "taglib/flacfile.h"
+#include "taglib/attachedpictureframe.h"
+#include "taglib/id3v2tag.h"
#include "taglib/tag.h"
#include <stdexcept>
|