duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update miniaudio to v0.10.1

Browse source 
This newer version supports marking all of its declarations as
static, avoiding the conflict between the miniaudio audio backend,
and the copy of miniaudio embedded in clownaudio in the enhanced
branch.
This commit is contained in:
Clownacy 2020-03-17 13:24:46 +00:00
parent 61aec1cb15
commit dd04977f29
4 changed files with 15341 additions and 8886 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -296,7 +296,7 @@ endif()
if(BACKEND_AUDIO MATCHES "SDL2") if(BACKEND_AUDIO MATCHES "SDL2")
target_sources(CSE2 PRIVATE "src/Backends/Audio/SDL2.cpp") target_sources(CSE2 PRIVATE "src/Backends/Audio/SDL2.cpp")
elseif(BACKEND_AUDIO MATCHES "miniaudio") elseif(BACKEND_AUDIO MATCHES "miniaudio")
target_sources(CSE2 PRIVATE "src/Backends/Audio/miniaudio.cpp" "external/miniaudio.c") target_sources(CSE2 PRIVATE "src/Backends/Audio/miniaudio.cpp")
# Link libdl, libm, and libpthread # Link libdl, libm, and libpthread
include(CheckLibraryExists) include(CheckLibraryExists)

3
external/miniaudio.c vendored
View file

@ -1,3 +0,0 @@
#define MINIAUDIO_IMPLEMENTATION
#define MA_NO_DECODING
#include "miniaudio.h"

24214
external/miniaudio.h vendored
View file

File diff suppressed because it is too large Load diff

2
src/Backends/Audio/miniaudio.cpp
View file

@ -6,7 +6,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#define MINIAUDIO_IMPLEMENTATION
#define MA_NO_DECODING #define MA_NO_DECODING
#define MA_API static
#include "miniaudio.h" #include "miniaudio.h"
#include "../../Organya.h" #include "../../Organya.h"