diff options
| -rw-r--r-- | cmake/modules/FindTagLib.cmake | 9 | ||||
| -rw-r--r-- | tools/depends/target/taglib/001-cmake-pdb-debug.patch | 18 | ||||
| -rw-r--r-- | tools/depends/target/taglib/Makefile | 3 | ||||
| -rw-r--r-- | tools/depends/target/taglib/TAGLIB-VERSION | 4 |
4 files changed, 20 insertions, 14 deletions
diff --git a/cmake/modules/FindTagLib.cmake b/cmake/modules/FindTagLib.cmake index 84f7b8dae9..9caafaff03 100644 --- a/cmake/modules/FindTagLib.cmake +++ b/cmake/modules/FindTagLib.cmake @@ -25,6 +25,10 @@ if(ENABLE_INTERNAL_TAGLIB) if(WIN32 OR WINDOWS_STORE) set(patches "${CMAKE_SOURCE_DIR}/tools/depends/target/${MODULE_LC}/001-cmake-pdb-debug.patch") generate_patchcommand("${patches}") + + if(WINDOWS_STORE) + set(EXTRA_ARGS -DPLATFORM_WINRT=ON) + endif() endif() # Debug postfix only used for windows @@ -33,7 +37,10 @@ if(ENABLE_INTERNAL_TAGLIB) endif() set(CMAKE_ARGS -DBUILD_SHARED_LIBS=OFF - -DBUILD_BINDINGS=OFF) + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTING=OFF + -DBUILD_BINDINGS=OFF + ${EXTRA_ARGS}) BUILD_DEP_TARGET() diff --git a/tools/depends/target/taglib/001-cmake-pdb-debug.patch b/tools/depends/target/taglib/001-cmake-pdb-debug.patch index f410cc33cf..1d2477c388 100644 --- a/tools/depends/target/taglib/001-cmake-pdb-debug.patch +++ b/tools/depends/target/taglib/001-cmake-pdb-debug.patch @@ -1,17 +1,15 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -58,6 +58,11 @@ - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") +@@ -64,6 +64,9 @@ + # https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-3-c4996 + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996") ++ ++ set(CMAKE_DEBUG_POSTFIX "d") ++ add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) endif() -+set(CMAKE_DEBUG_POSTFIX "d") -+if(MSVC) -+ add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) -+endif() -+ - if(MSVC AND ENABLE_STATIC_RUNTIME) - foreach(flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) - string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") + # Read version information from file taglib/toolkit/taglib.h into variables --- a/taglib/CMakeLists.txt +++ b/taglib/CMakeLists.txt @@ -341,6 +341,12 @@ diff --git a/tools/depends/target/taglib/Makefile b/tools/depends/target/taglib/Makefile index 2ae922950e..febeb86f73 100644 --- a/tools/depends/target/taglib/Makefile +++ b/tools/depends/target/taglib/Makefile @@ -9,7 +9,8 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS) rm -rf $(PLATFORM); mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) cd $(PLATFORM); rm -rf build; mkdir -p build - cd $(PLATFORM)/build; $(CMAKE) -DBUILD_SHARED_LIBS=OFF -DBUILD_BINDINGS=OFF -DCMAKE_BUILD_TYPE=Debug .. + cd $(PLATFORM); patch -p1 -i ../001-cmake-pdb-debug.patch + cd $(PLATFORM)/build; $(CMAKE) -DBUILD_SHARED_LIBS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -DBUILD_BINDINGS=OFF -DCMAKE_BUILD_TYPE=Debug .. $(LIBDYLIB): $(PLATFORM) $(MAKE) -C $(PLATFORM)/build diff --git a/tools/depends/target/taglib/TAGLIB-VERSION b/tools/depends/target/taglib/TAGLIB-VERSION index 8f980b0b26..b1f8df4d5b 100644 --- a/tools/depends/target/taglib/TAGLIB-VERSION +++ b/tools/depends/target/taglib/TAGLIB-VERSION @@ -1,6 +1,6 @@ LIBNAME=taglib -VERSION=1.12 +VERSION=1.13 ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz -SHA512=7e369faa5e3c6c6401052b7a19e35b0cf8c1e5ed9597053ac731a7718791d5d4803d1b18a93e903ec8c3fc6cb92e34d9616daa2ae4d326965d4c4d5624dcdaba +SHA512=b6e3253d158b41173073c0da1915f5e4a3de947db918660817cb1c755fba7e3723ea1a335fbbc30b0dcf942348a471b493fe2ce1d52d1a808578edee14e1bfc7 BYPRODUCT=libtag.a BYPRODUCT_WIN=tag.lib |