M .gitmodules => .gitmodules +4 -4
@@ 36,10 36,6 @@
[submodule "module-utils/date"]
path = third-party/date
url = ../date.git
-[submodule "module-audio/Audio/decoder/minimp3"]
- path = module-audio/Audio/decoder/minimp3
- url = ../minimp3.git
- branch = RT1051
[submodule "module-utils/taglib"]
path = module-utils/taglib
url = ../taglib.git
@@ 84,3 80,7 @@
[submodule "module-utils/CrashDebug"]
path = module-utils/CrashDebug
url = https://github.com/adamgreen/CrashDebug.git
+[submodule "third-party/minimp3/minimp3"]
+ path = third-party/minimp3/minimp3
+ url = ../minimp3.git
+ branch = RT1051
M cmake/modules/PureCoverage.cmake => cmake/modules/PureCoverage.cmake +1 -4
@@ 22,7 22,6 @@ if(COVERAGE_ENABLE)
board/linux/libiosyscalls/.*
host-tools/.*
module-audio/Audio/decoder/dr_flac.h
- module-audio/Audio/decoder/minimp3/minimp3.h
module-bluetooth/Bluetooth/glucode/.*
module-bluetooth/lib/.*
module-db/Database/sqlite3.c
@@ 31,17 30,15 @@ if(COVERAGE_ENABLE)
module-utils/gsl/.*
module-utils/json/.*
module-utils/libphonenumber/.*
- module-utils/microtar/.*
module-utils/parallel-hashmap/.*
module-utils/protobuf/.*
- third-party/pugixml/.*
module-utils/re2/.*
module-utils/segger/.*
- module-utils/sml/.*
module-utils/taglib/.*
module-utils/tinyexpr/.*
source/main.cpp
test/.*
+ third-party/.*
)
SET(GCOVR_ADDITIONAL_ARGS
M module-audio/Audio/decoder/decoderMP3.hpp => module-audio/Audio/decoder/decoderMP3.hpp +3 -4
@@ 1,12 1,11 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include "minimp3/minimp3.h"
-
-#include <cstring>
#include "Decoder.hpp"
+#include <minimp3.h>
+#include <cstring>
extern "C"
{
D module-audio/Audio/decoder/minimp3 => module-audio/Audio/decoder/minimp3 +0 -1
@@ 1,1 0,0 @@
-Subproject commit 446d3a32d281eb1dcae7726ba0ff594695182908
M module-audio/CMakeLists.txt => module-audio/CMakeLists.txt +8 -6
@@ 66,12 66,14 @@ set_source_files_properties(
)
target_link_libraries(${PROJECT_NAME}
- ${AUDIO_BOARD_LIBRARY}
- module-bsp
- module-os
- module-utils
- module-sys
- tag
+ PUBLIC
+ ${AUDIO_BOARD_LIBRARY}
+ module-bsp
+ module-os
+ module-utils
+ module-sys
+ tag
+ minimp3::minimp3
)
if (${ENABLE_TESTS})
M third-party/CMakeLists.txt => third-party/CMakeLists.txt +1 -0
@@ 5,3 5,4 @@ add_subdirectory(microtar)
add_subdirectory(date)
add_subdirectory(pugixml)
add_subdirectory(sml)
+add_subdirectory(minimp3)
A third-party/minimp3/CMakeLists.txt => third-party/minimp3/CMakeLists.txt +7 -0
@@ 0,0 1,7 @@
+add_library(minimp3 INTERFACE)
+add_library(minimp3::minimp3 ALIAS minimp3)
+
+target_include_directories(minimp3
+ INTERFACE
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/minimp3>
+)
A third-party/minimp3/minimp3 => third-party/minimp3/minimp3 +1 -0
@@ 0,0 1,1 @@
+Subproject commit 446d3a32d281eb1dcae7726ba0ff594695182908