From 4bf35971168a5fa2b5759dc0c3d05a3767f30f95 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 30 Dec 2019 19:19:17 -0800
Subject: [PATCH 1/3] Fix NOOPENMPT compiling

---
 src/s_sound.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/s_sound.c b/src/s_sound.c
index a49499040..0235d8376 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -61,7 +61,9 @@ static void GameMIDIMusic_OnChange(void);
 static void GameSounds_OnChange(void);
 static void GameDigiMusic_OnChange(void);
 
+#ifdef HAVE_OPENMPT
 static void ModFilter_OnChange(void);
+#endif
 
 static lumpnum_t S_GetMusicLumpNum(const char *mname);
 

From 782bf8d31ed486679011a1c4b57f823e3e53c5d2 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 30 Dec 2019 20:08:29 -0800
Subject: [PATCH 2/3] Fix NOMIXER compiling

---
 src/sdl/sdl_sound.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/sdl/sdl_sound.c b/src/sdl/sdl_sound.c
index 33b366bf6..b8991293c 100644
--- a/src/sdl/sdl_sound.c
+++ b/src/sdl/sdl_sound.c
@@ -1432,6 +1432,8 @@ static void I_ResumeGME(void)
 
 boolean I_LoadSong(char *data, size_t len)
 {
+	(void)data;
+	(void)len;
 	return false;
 }
 
@@ -1493,6 +1495,7 @@ boolean I_FadeSongFromVolume(UINT8 target_volume, UINT8 source_volume, UINT32 ms
 	(void)target_volume;
 	(void)source_volume;
 	(void)ms;
+	(void)callback;
 	return false;
 }
 
@@ -1500,6 +1503,7 @@ boolean I_FadeSong(UINT8 target_volume, UINT32 ms, void (*callback)(void))
 {
 	(void)target_volume;
 	(void)ms;
+	(void)callback;
 	return false;
 }
 

From 36c5bb7b0d32cd14c7b6ddc17f64c62c65965eb9 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 30 Dec 2019 20:18:08 -0800
Subject: [PATCH 3/3] Fix NOHW compiling

---
 src/r_defs.h   | 4 +++-
 src/r_things.c | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/r_defs.h b/src/r_defs.h
index 964956503..2791ac8b0 100644
--- a/src/r_defs.h
+++ b/src/r_defs.h
@@ -740,9 +740,11 @@ typedef struct
 {
 	patch_t *patch[8][ROTANGLES];
 	boolean cached[8];
+#ifdef HWRENDER
 	aatree_t *hardware_patch[8];
+#endif/*HWRENDER*/
 } rotsprite_t;
-#endif
+#endif/*ROTSPRITE*/
 
 typedef enum
 {
diff --git a/src/r_things.c b/src/r_things.c
index bbe62d88a..a328da03a 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -125,9 +125,11 @@ static void R_InstallSpriteLump(UINT16 wad,            // graphics patch
 		sprtemp[frame].rotsprite.cached[r] = false;
 		for (ang = 0; ang < ROTANGLES; ang++)
 			sprtemp[frame].rotsprite.patch[r][ang] = NULL;
+#ifdef HWRENDER
 		sprtemp[frame].rotsprite.hardware_patch[r] = M_AATreeAlloc(AATREE_ZUSER);
+#endif/*HWRENDER*/
 	}
-#endif
+#endif/*ROTSPRITE*/
 
 	if (rotation == 0)
 	{