From 9b25a87ebb0f9c1cefb19ae0d79bf9e85d26e938 Mon Sep 17 00:00:00 2001
From: Samuel Gomes <samuel_gomes@outlook.com>
Date: Thu, 4 Jul 2024 05:02:45 +0530
Subject: [PATCH] Revert stub_audio.cpp per suggestion in #517

---
 Makefile                              | 4 +---
 internal/c/libqb/include/audio.h      | 6 ------
 internal/c/parts/audio/build.mk       | 7 ++++++-
 internal/c/parts/audio/stub_audio.cpp | 5 +++++
 4 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 internal/c/parts/audio/stub_audio.cpp

diff --git a/Makefile b/Makefile
index 5da9af503..d0ef36344 100644
--- a/Makefile
+++ b/Makefile
@@ -311,12 +311,10 @@ ifneq ($(filter y,$(DEP_AUDIO_MINIAUDIO)),)
 	ifeq ($(OS),osx)
 		CXXLIBS += -lpthread -lm -framework CoreAudio -framework CoreMIDI -framework AudioUnit -framework AudioToolbox
 	endif
-	QBLIB_NAME := $(addsuffix 1,$(QBLIB_NAME))
 
 	LICENSE_IN_USE += miniaudio stb_vorbis libxmp-lite radv2 hivelytracker qoa foo_midi ymfmidi primesynth tinysoundfont
-
 else
-	QBLIB_NAME := $(addsuffix 0,$(QBLIB_NAME))
+	EXE_LIBS += $(AUDIO_STUB_OBJS)
 endif
 
 ifneq ($(filter y,$(DEP_ZLIB)),)
diff --git a/internal/c/libqb/include/audio.h b/internal/c/libqb/include/audio.h
index 10b308955..a83db3420 100644
--- a/internal/c/libqb/include/audio.h
+++ b/internal/c/libqb/include/audio.h
@@ -61,12 +61,6 @@ mem_block func__memsound(int32_t handle, int32_t targetChannel, int32_t passed);
 int32_t func__sndnew(int32_t frames, int32_t channels, int32_t bits);
 void sub__midisoundbank(qbs *qbsFileName, qbs *qbsRequirements, int32_t passed);
 
-#ifdef DEPENDENCY_AUDIO_MINIAUDIO
 void snd_init();
 void snd_un_init();
 void snd_mainloop();
-#else
-static inline void snd_mainloop() { return; }
-static inline void snd_init() { return; }
-static inline void snd_un_init() { return; }
-#endif
diff --git a/internal/c/parts/audio/build.mk b/internal/c/parts/audio/build.mk
index 698ead15d..badfe4882 100644
--- a/internal/c/parts/audio/build.mk
+++ b/internal/c/parts/audio/build.mk
@@ -5,6 +5,11 @@ MINIAUDIO_SRCS := \
 
 MINIAUDIO_OBJS := $(patsubst %.cpp,$(PATH_INTERNAL_C)/parts/audio/%.o,$(MINIAUDIO_SRCS))
 
+AUDIO_STUB_SRCS := \
+	stub_audio.cpp
+
+AUDIO_STUB_OBJS := $(patsubst %.cpp,$(PATH_INTERNAL_C)/parts/audio/%.o,$(AUDIO_STUB_SRCS))
+
 # DEPENDENCY_CONSOLE_ONLY is added here to keep these .cpp files from including
 # the FreeGLUT headers via `libqb.h`. Ideally this is fixed properly in the future.
 $(PATH_INTERNAL_C)/parts/audio/%.o: $(PATH_INTERNAL_C)/parts/audio/%.cpp
@@ -15,5 +20,5 @@ AUDIO_LIB := $(PATH_INTERNAL_C)/parts/audio/audio.a
 $(AUDIO_LIB): $(MINIAUDIO_OBJS) $(FOO_MIDI_OBJS) $(HIVELYTRACKER_OBJS) $(LIBMIDI_OBJS) $(LIBXMP_OBJS) $(PRIMESYNTH_OBJS) $(OPAL_OBJS) $(TINYSOUNDFONT_OBJS) $(YMFMIDI_OBJS) $(MA_VTABLES_OBJS)
 	$(AR) rcs $@ $(MINIAUDIO_OBJS) $(FOO_MIDI_OBJS) $(HIVELYTRACKER_OBJS) $(LIBMIDI_OBJS) $(LIBXMP_OBJS) $(PRIMESYNTH_OBJS) $(OPAL_OBJS) $(TINYSOUNDFONT_OBJS) $(YMFMIDI_OBJS) $(MA_VTABLES_OBJS)
 
-CLEAN_LIST += $(MINIAUDIO_OBJS) $(AUDIO_LIB)
+CLEAN_LIST += $(MINIAUDIO_OBJS) $(AUDIO_LIB) $(AUDIO_STUB_OBJS)
 
diff --git a/internal/c/parts/audio/stub_audio.cpp b/internal/c/parts/audio/stub_audio.cpp
new file mode 100644
index 000000000..36bed2a09
--- /dev/null
+++ b/internal/c/parts/audio/stub_audio.cpp
@@ -0,0 +1,5 @@
+#include "audio.h"
+
+void snd_mainloop() { return; }
+void snd_init() { return; }
+void snd_un_init() { return; }