From a943e80b1a17122b98a9934245a12362ff1184c5 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Sat, 29 Feb 2020 18:03:31 +0000 Subject: [PATCH] Add miniaudio audio backend to Makefile Also made the CMake file link the libs miniaudio needs --- CMakeLists.txt | 15 +++++++++++++++ Makefile | 12 ++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b926b6fd..426e088a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -364,6 +364,21 @@ if(AUDIO_BACKEND MATCHES "SDL2") target_sources(CSE2 PRIVATE "src/Backends/Audio/SDL2.cpp") elseif(AUDIO_BACKEND MATCHES "miniaudio") target_sources(CSE2 PRIVATE "src/Backends/Audio/miniaudio.cpp") + + # Link libdl, libm, and libpthread + include(CheckLibraryExists) + + check_library_exists(m pow "" LIBM) + if(LIBM) + target_link_libraries(CSE2 PRIVATE m) + endif() + + check_library_exists(pthread pthread_create "" LIBPTHREAD) + if(LIBPTHREAD) + target_link_libraries(CSE2 PRIVATE pthread) + endif() + + target_link_libraries(CSE2 PRIVATE ${CMAKE_DL_LIBS}) else() message(FATAL_ERROR "Invalid AUDIO_BACKEND selected") endif() diff --git a/Makefile b/Makefile index 80cf893c..37a93c85 100644 --- a/Makefile +++ b/Makefile @@ -167,8 +167,7 @@ SOURCES = \ src/Star.cpp \ src/TextScr.cpp \ src/Triangle.cpp \ - src/ValueView.cpp \ - src/Backends/Audio/SDL2.cpp + src/ValueView.cpp RESOURCES = \ BITMAP/Credit01.bmp \ @@ -271,6 +270,15 @@ else $(error Invalid RENDERER selected) endif +ifeq ($(AUDIO_BACKEND), SDL2) + SOURCES += src/Backends/Audio/SDL2.cpp +else ifeq ($(AUDIO_BACKEND), miniaudio) + SOURCES += src/Backends/Audio/miniaudio.cpp + CSE2_LIBS += -ldl -lm -lpthread +else + $(error Invalid AUDIO_BACKEND selected) +endif + OBJECTS = $(addprefix obj/$(FILENAME)/, $(addsuffix .o, $(SOURCES))) DEPENDENCIES = $(addprefix obj/$(FILENAME)/, $(addsuffix .o.d, $(SOURCES)))