From 9af25f7c67a6015eae76b6c6e211d96ab218adb2 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Wed, 4 Mar 2020 21:02:17 +0000 Subject: [PATCH] Hopefully fixed miniaudio backend on Windows Stupid BOOL type --- CMakeLists.txt | 2 +- Makefile | 2 +- external/miniaudio.c | 3 +++ src/Backends/Audio/miniaudio.cpp | 1 - 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 external/miniaudio.c diff --git a/CMakeLists.txt b/CMakeLists.txt index f3b334f4..1913bff4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -363,7 +363,7 @@ endif() if(BACKEND_AUDIO MATCHES "SDL2") target_sources(CSE2 PRIVATE "src/Backends/Audio/SDL2.cpp") elseif(BACKEND_AUDIO MATCHES "miniaudio") - target_sources(CSE2 PRIVATE "src/Backends/Audio/miniaudio.cpp") + target_sources(CSE2 PRIVATE "src/Backends/Audio/miniaudio.cpp" "external/miniaudio.c") # Link libdl, libm, and libpthread include(CheckLibraryExists) diff --git a/Makefile b/Makefile index 4879216c..eb736543 100644 --- a/Makefile +++ b/Makefile @@ -274,7 +274,7 @@ endif ifeq ($(BACKEND_AUDIO), SDL2) SOURCES += src/Backends/Audio/SDL2.cpp else ifeq ($(BACKEND_AUDIO), miniaudio) - SOURCES += src/Backends/Audio/miniaudio.cpp + SOURCES += src/Backends/Audio/miniaudio.cpp external/miniaudio.c CSE2_LIBS += -ldl -lm -lpthread else $(error Invalid BACKEND_AUDIO selected) diff --git a/external/miniaudio.c b/external/miniaudio.c new file mode 100644 index 00000000..9535ce5c --- /dev/null +++ b/external/miniaudio.c @@ -0,0 +1,3 @@ +#define MINIAUDIO_IMPLEMENTATION +#define MA_NO_DECODING +#include "miniaudio.h" diff --git a/src/Backends/Audio/miniaudio.cpp b/src/Backends/Audio/miniaudio.cpp index cd22d83f..dca0b076 100644 --- a/src/Backends/Audio/miniaudio.cpp +++ b/src/Backends/Audio/miniaudio.cpp @@ -6,7 +6,6 @@ #include #include -#define MINIAUDIO_IMPLEMENTATION #define MA_NO_DECODING #include "miniaudio.h"