M .gitmodules => .gitmodules +1 -1
@@ 41,7 41,7 @@
url = ../minimp3.git
branch = RT1051
[submodule "module-audio/Audio/decoder/taglib"]
- path = module-audio/Audio/decoder/taglib
+ path = module-utils/taglib
url = ../taglib.git
branch = rt1051
[submodule "module-bluetooth/lib/btstack"]
D module-audio/Audio/decoder/taglib => module-audio/Audio/decoder/taglib +0 -1
@@ 1,1 0,0 @@
-Subproject commit b2a6e50aedf0cfe1f808eb23dc9f572a848ddffe
M module-audio/CMakeLists.txt => module-audio/CMakeLists.txt +3 -7
@@ 3,13 3,6 @@ cmake_minimum_required(VERSION 3.12)
project(module-audio VERSION 1.0
DESCRIPTION "Audio module library")
-add_subdirectory(Audio/decoder/taglib EXCLUDE_FROM_ALL)
-
-include_directories(
- ${CMAKE_CURRENT_BINARY_DIR}/Audio/decoder/taglib
- ${CMAKE_CURRENT_SOURCE_DIR}/Audio/decoder/taglib/taglib
- ${CMAKE_CURRENT_SOURCE_DIR}/Audio/decoder/taglib/taglib/toolkit
-)
set(SOURCES
"${CMAKE_CURRENT_SOURCE_DIR}/Audio/decoder/decoder.cpp"
@@ 41,6 34,9 @@ endif()
add_library(${PROJECT_NAME} STATIC ${SOURCES} ${BOARD_SOURCES})
+target_include_directories( ${PROJECT_NAME} PRIVATE ${TAGLIB_INCLUDE_DIRS} )
+
+
# Board specific compilation definitions,options,include directories and features
target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS})
target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_TARGET})
M module-utils/CMakeLists.txt => module-utils/CMakeLists.txt +8 -0
@@ 47,6 47,14 @@ include(third-party/tinyexpr.cmake)
add_subdirectory(pugixml)
+add_subdirectory(taglib)
+set( TAGLIB_INCLUDE_DIRS
+ "${CMAKE_CURRENT_SOURCE_DIR}/taglib/taglib/toolkit"
+ "${CMAKE_CURRENT_SOURCE_DIR}/taglib/taglib"
+ "${CMAKE_CURRENT_BINARY_DIR}/taglib"
+ PARENT_SCOPE
+)
+
target_link_libraries(${PROJECT_NAME} PUBLIC module-os module-vfs pugixml)
# Board specific compilation definitions,options,include directories and features
A module-utils/taglib => module-utils/taglib +1 -0
@@ 0,0 1,1 @@
+Subproject commit b2a6e50aedf0cfe1f808eb23dc9f572a848ddffe