From d21a390d57157632771b33023fbba11626c864cc Mon Sep 17 00:00:00 2001 From: taurusxin Date: Fri, 3 Oct 2025 22:45:21 +0800 Subject: [PATCH] removed: git submodule taglib --- .gitmodules | 3 --- CMakeLists.txt | 24 +++--------------------- src/ncmcrypt.cpp | 13 ++++++------- taglib | 1 - 4 files changed, 9 insertions(+), 32 deletions(-) delete mode 100644 .gitmodules delete mode 160000 taglib diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index fc15825..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "taglib"] - path = taglib - url = https://github.com/taglib/taglib.git diff --git a/CMakeLists.txt b/CMakeLists.txt index d1edf00..2b08794 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,10 +5,7 @@ project(ncmdump LANGUAGES CXX) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) -set(WITH_ZLIB OFF) -set(BUILD_TESTING OFF) -add_subdirectory(taglib) +find_package(TagLib REQUIRED) if(MSVC) add_compile_options("$<$:/execution-charset:utf-8>") @@ -38,19 +35,8 @@ if(WIN32) set_target_properties(ncmdump_lib PROPERTIES OUTPUT_NAME "libncmdump") - target_include_directories(ncmdump_lib PRIVATE src/include) + target_link_libraries(ncmdump_lib TagLib::tag) - target_link_libraries(ncmdump_lib tag) - target_include_directories(ncmdump_lib PRIVATE taglib) - target_include_directories(ncmdump_lib PRIVATE taglib/taglib) - target_include_directories(ncmdump_lib PRIVATE taglib/taglib/toolkit) - target_include_directories(ncmdump_lib PRIVATE taglib/taglib/mpeg/id3v2) - - if(CMAKE_COMPILER_IS_GNUCXX) - # static link when using MinGW - target_link_options(ncmdump_exec PRIVATE -static) - target_link_options(ncmdump_lib PRIVATE -static) - endif() else() add_executable(ncmdump_exec ${COMMON_HEADERS} @@ -63,11 +49,7 @@ endif() 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) +target_link_libraries(ncmdump_exec TagLib::tag) include(GNUInstallDirs) diff --git a/src/ncmcrypt.cpp b/src/ncmcrypt.cpp index c41ac1a..7f7d9c9 100644 --- a/src/ncmcrypt.cpp +++ b/src/ncmcrypt.cpp @@ -4,13 +4,12 @@ #include "cJSON.h" #include "color.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/tag.h" +#include +#include +#include +#include +#include +#include #include #include diff --git a/taglib b/taglib deleted file mode 160000 index e3de035..0000000 --- a/taglib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e3de03501ff66221d1f1f971022b248d5b38ba06