Made miniaudio anonymous so it doesn't go outside of translation unit
This commit is contained in:
BIN
.cache/clangd/index/ChargeAudio.hpp.B4F8ECF0C7F6CA38.idx
Normal file
BIN
.cache/clangd/index/ChargeAudio.hpp.B4F8ECF0C7F6CA38.idx
Normal file
Binary file not shown.
BIN
.cache/clangd/index/Engine.cpp.8BC53A20A9E24317.idx
Normal file
BIN
.cache/clangd/index/Engine.cpp.8BC53A20A9E24317.idx
Normal file
Binary file not shown.
BIN
.cache/clangd/index/Sound.cpp.7181ED22A085F74C.idx
Normal file
BIN
.cache/clangd/index/Sound.cpp.7181ED22A085F74C.idx
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
.cache/clangd/index/ma_ltrim_node.c.1F1D9F87874A711B.idx
Normal file
BIN
.cache/clangd/index/ma_ltrim_node.c.1F1D9F87874A711B.idx
Normal file
Binary file not shown.
BIN
.cache/clangd/index/ma_ltrim_node.h.9B38F500662F2C91.idx
Normal file
BIN
.cache/clangd/index/ma_ltrim_node.h.9B38F500662F2C91.idx
Normal file
Binary file not shown.
BIN
.cache/clangd/index/ma_reverb_node.c.5CDA62887FAFEC64.idx
Normal file
BIN
.cache/clangd/index/ma_reverb_node.c.5CDA62887FAFEC64.idx
Normal file
Binary file not shown.
BIN
.cache/clangd/index/ma_reverb_node.h.66B927265598A3E1.idx
Normal file
BIN
.cache/clangd/index/ma_reverb_node.h.66B927265598A3E1.idx
Normal file
Binary file not shown.
BIN
.cache/clangd/index/ma_vocoder_node.c.6933ED8910D107AC.idx
Normal file
BIN
.cache/clangd/index/ma_vocoder_node.c.6933ED8910D107AC.idx
Normal file
Binary file not shown.
BIN
.cache/clangd/index/ma_vocoder_node.h.F61925706CFBA93F.idx
Normal file
BIN
.cache/clangd/index/ma_vocoder_node.h.F61925706CFBA93F.idx
Normal file
Binary file not shown.
BIN
.cache/clangd/index/miniaudio.c.A97DCE0B7D3B96B0.idx
Normal file
BIN
.cache/clangd/index/miniaudio.c.A97DCE0B7D3B96B0.idx
Normal file
Binary file not shown.
BIN
.cache/clangd/index/miniaudio.h.B3A92D167AF63945.idx
Normal file
BIN
.cache/clangd/index/miniaudio.h.B3A92D167AF63945.idx
Normal file
Binary file not shown.
BIN
.cache/clangd/index/miniaudio_libvorbis.c.882E42123E75E7D9.idx
Normal file
BIN
.cache/clangd/index/miniaudio_libvorbis.c.882E42123E75E7D9.idx
Normal file
Binary file not shown.
BIN
.cache/clangd/index/miniaudio_libvorbis.h.357BDC55E11E9C5C.idx
Normal file
BIN
.cache/clangd/index/miniaudio_libvorbis.h.357BDC55E11E9C5C.idx
Normal file
Binary file not shown.
BIN
.cache/clangd/index/verblib.h.9357C93409D4CD9C.idx
Normal file
BIN
.cache/clangd/index/verblib.h.9357C93409D4CD9C.idx
Normal file
Binary file not shown.
BIN
.cache/clangd/index/voclib.h.B4732425DE423CC4.idx
Normal file
BIN
.cache/clangd/index/voclib.h.B4732425DE423CC4.idx
Normal file
Binary file not shown.
@@ -3,12 +3,12 @@ cmake_minimum_required(VERSION 3.10)
|
|||||||
project(ChargeAudio VERSION 1.0)
|
project(ChargeAudio VERSION 1.0)
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
|
set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
|
||||||
set(CMAKE_MODULE_PATH "modules/" ${CMAKE_MODULE_PATH})
|
set(CMAKE_MODULE_PATH "modules/" ${CMAKE_MODULE_PATH})
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
|
||||||
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fsanitize=address")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fsanitize=address")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_subdirectory(lib/miniaudio)
|
add_subdirectory(lib/miniaudio)
|
||||||
|
|
||||||
find_package(Corrade REQUIRED Main)
|
find_package(Corrade REQUIRED Main)
|
||||||
@@ -20,7 +20,7 @@ pkg_check_modules(AVUTIL REQUIRED libavutil)
|
|||||||
pkg_check_modules(SWRESAMPLE REQUIRED libswresample)
|
pkg_check_modules(SWRESAMPLE REQUIRED libswresample)
|
||||||
|
|
||||||
add_library(ChargeAudio SHARED "src/ChargeAudio.hpp" "src/Engine.cpp"
|
add_library(ChargeAudio SHARED "src/ChargeAudio.hpp" "src/Engine.cpp"
|
||||||
"src/Sound.cpp")
|
"src/Sound.cpp" "lib/miniaudio/miniaudio.c")
|
||||||
|
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
ChargeAudio
|
ChargeAudio
|
||||||
@@ -28,8 +28,10 @@ target_link_libraries(
|
|||||||
${AVCODEC_LIBRARIES} ${AVUTIL_LIBRARIES} ${SWRESAMPLE_LIBRARIES})
|
${AVCODEC_LIBRARIES} ${AVUTIL_LIBRARIES} ${SWRESAMPLE_LIBRARIES})
|
||||||
|
|
||||||
target_include_directories(
|
target_include_directories(
|
||||||
ChargeAudio PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
|
ChargeAudio
|
||||||
$<INSTALL_INTERFACE:include>)
|
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
|
||||||
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib>
|
||||||
|
$<INSTALL_INTERFACE:include>)
|
||||||
|
|
||||||
# Library
|
# Library
|
||||||
install(
|
install(
|
||||||
@@ -41,6 +43,7 @@ install(
|
|||||||
|
|
||||||
# include
|
# include
|
||||||
install(FILES src/ChargeAudio.hpp DESTINATION include/Charge)
|
install(FILES src/ChargeAudio.hpp DESTINATION include/Charge)
|
||||||
|
install(FILES lib/miniaudio/miniaudio.h DESTINATION include/Charge/miniaudio/)
|
||||||
|
|
||||||
install(
|
install(
|
||||||
EXPORT ChargeAudioTargets
|
EXPORT ChargeAudioTargets
|
||||||
|
@@ -1,11 +1,13 @@
|
|||||||
#ifndef CHARGE_AUDIO_BASE_H
|
#ifndef CHARGE_AUDIO_BASE_H
|
||||||
#define CHARGE_AUDIO_BASE_H
|
#define CHARGE_AUDIO_BASE_H
|
||||||
#include "../lib/miniaudio/miniaudio.h"
|
|
||||||
#include <Magnum/Magnum.h>
|
#include <Magnum/Magnum.h>
|
||||||
#include <Magnum/Math/Vector.h>
|
#include <Magnum/Math/Vector.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
namespace ChargeAudio {
|
namespace ChargeAudio {
|
||||||
|
namespace {
|
||||||
|
#include "miniaudio/miniaudio.h"
|
||||||
|
}
|
||||||
class Sound {
|
class Sound {
|
||||||
public:
|
public:
|
||||||
~Sound();
|
~Sound();
|
||||||
@@ -35,5 +37,6 @@ private:
|
|||||||
ma_engine maEngine;
|
ma_engine maEngine;
|
||||||
ma_result maResponse;
|
ma_result maResponse;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace ChargeAudio
|
} // namespace ChargeAudio
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user