From 48208e2edaede177e735de91cb4c477b80c49180 Mon Sep 17 00:00:00 2001
From: Matthew Kilgore <mattkilgore12@gmail.com>
Date: Fri, 26 Aug 2022 23:36:44 -0400
Subject: [PATCH] Change miniaudio build logic to always clean all files

---
 internal/c/parts/audio/build.mk | 89 ++++++++++++++++++---------------
 1 file changed, 48 insertions(+), 41 deletions(-)

diff --git a/internal/c/parts/audio/build.mk b/internal/c/parts/audio/build.mk
index 7e555b1ff..9c491e820 100644
--- a/internal/c/parts/audio/build.mk
+++ b/internal/c/parts/audio/build.mk
@@ -1,51 +1,58 @@
-# Include the correct files if DEP_AUDIO_OUT is defined
+
+MINIAUDIO_REAL_SRCS := \
+	audio.cpp \
+	miniaudio_impl.cpp
+
+MINIAUDIO_REAL_EXTRAS_SRCS := \
+	extras/libxmp-lite/common.c \
+	extras/libxmp-lite/control.c \
+	extras/libxmp-lite/dataio.c \
+	extras/libxmp-lite/effects.c \
+	extras/libxmp-lite/filter.c \
+	extras/libxmp-lite/format.c \
+	extras/libxmp-lite/hio.c \
+	extras/libxmp-lite/it_load.c \
+	extras/libxmp-lite/itsex.c \
+	extras/libxmp-lite/lfo.c \
+	extras/libxmp-lite/load.c \
+	extras/libxmp-lite/load_helpers.c \
+	extras/libxmp-lite/md5.c \
+	extras/libxmp-lite/memio.c \
+	extras/libxmp-lite/misc.c \
+	extras/libxmp-lite/mix_all.c \
+	extras/libxmp-lite/mixer.c \
+	extras/libxmp-lite/mod_load.c \
+	extras/libxmp-lite/period.c \
+	extras/libxmp-lite/player.c \
+	extras/libxmp-lite/read_event.c \
+	extras/libxmp-lite/s3m_load.c \
+	extras/libxmp-lite/sample.c \
+	extras/libxmp-lite/scan.c \
+	extras/libxmp-lite/smix.c \
+	extras/libxmp-lite/virtual.c \
+	extras/libxmp-lite/win32.c \
+	extras/libxmp-lite/xm_load.c
+
+MINIAUDIO_STUB_SRCS := \
+	stub_audio.cpp
+
+# We always produce both lists so that `make clean` will clean them up even
+# when not passed a paticular DEP_* flag
+MINIAUDIO_REAL_OBJS := $(patsubst %.cpp,$(PATH_INTERNAL_C)/parts/audio/%.o,$(MINIAUDIO_REAL_SRCS))
+MINIAUDIO_REAL_OBJS += $(patsubst %.c,$(PATH_INTERNAL_C)/parts/audio/%.o,$(MINIAUDIO_REAL_EXTRAS_SRCS))
+
+MINIAUDIO_STUB_OBJS := $(patsubst %.cpp,$(PATH_INTERNAL_C)/parts/audio/%.o,$(MINIAUDIO_STUB_SRCS))
+
 ifdef DEP_AUDIO_MINIAUDIO
-	MINIAUDIO_SRCS := \
-		audio.cpp \
-		miniaudio_impl.cpp
-
-	MINIAUDIO_EXTRAS_SRCS := \
-		extras/libxmp-lite/common.c \
-		extras/libxmp-lite/control.c \
-		extras/libxmp-lite/dataio.c \
-		extras/libxmp-lite/effects.c \
-		extras/libxmp-lite/filter.c \
-		extras/libxmp-lite/format.c \
-		extras/libxmp-lite/hio.c \
-		extras/libxmp-lite/it_load.c \
-		extras/libxmp-lite/itsex.c \
-		extras/libxmp-lite/lfo.c \
-		extras/libxmp-lite/load.c \
-		extras/libxmp-lite/load_helpers.c \
-		extras/libxmp-lite/md5.c \
-		extras/libxmp-lite/memio.c \
-		extras/libxmp-lite/misc.c \
-		extras/libxmp-lite/mix_all.c \
-		extras/libxmp-lite/mixer.c \
-		extras/libxmp-lite/mod_load.c \
-		extras/libxmp-lite/period.c \
-		extras/libxmp-lite/player.c \
-		extras/libxmp-lite/read_event.c \
-		extras/libxmp-lite/s3m_load.c \
-		extras/libxmp-lite/sample.c \
-		extras/libxmp-lite/scan.c \
-		extras/libxmp-lite/smix.c \
-		extras/libxmp-lite/virtual.c \
-		extras/libxmp-lite/win32.c \
-		extras/libxmp-lite/xm_load.c
+	MINIAUDIO_OBJS := $(MINIAUDIO_REAL_OBJS)
 else
-# If DEP_AUDIO_MINIAUDIO is undefined, then we compile a stub that doesn't do anything
-	MINIAUDIO_SRCS := \
-		stub_audio.cpp
+	MINIAUDIO_OBJS := $(MINIAUDIO_STUB_OBJS)
 endif
 
-MINIAUDIO_OBJS := $(patsubst %.cpp,$(PATH_INTERNAL_C)/parts/audio/%.o,$(MINIAUDIO_SRCS))
-MINIAUDIO_OBJS += $(patsubst %.c,$(PATH_INTERNAL_C)/parts/audio/%.o,$(MINIAUDIO_EXTRAS_SRCS))
-
 $(PATH_INTERNAL_C)/parts/audio/%.o: $(PATH_INTERNAL_C)/parts/audio/%.cpp
 	$(CXX) $(CXXFLAGS) -Wall $< -c -o $@
 
 $(PATH_INTERNAL_C)/parts/audio/extras/libxmp-lite/%.o: $(PATH_INTERNAL_C)/parts/audio/extras/libxmp-lite/%.c
 	$(CC) $(CFLAGS) -Wall -DLIBXMP_CORE_PLAYER -DLIBXMP_NO_PROWIZARD -DLIBXMP_NO_DEPACKERS -DBUILDING_STATIC $< -c -o $@
 
-CLEAN_LIST += $(MINIAUDIO_OBJS)
+CLEAN_LIST += $(MINIAUDIO_REAL_OBJS) $(MINIAUDIO_STUB_OBJS)