commit 7a1f38ce328a1dd5fc39666e6b5afbd1bfb429fa
Author:     Turo Lamminen <turol@iki.fi>
AuthorDate: Tue Mar 12 17:58:00 2024 +0200
Commit:     Turo Lamminen <turol@users.noreply.github.com>
CommitDate: Tue Mar 12 19:54:20 2024 +0200

    Don't try to include SDL_mixer.h when SDL_mixer is disabled
---
 pcsound/pcsound_sdl.c | 5 ++++-
 src/i_musicpack.c     | 2 +-
 src/i_sdlmusic.c      | 3 ++-
 src/i_sdlsound.c      | 3 ++-
 src/i_sound.c         | 9 +++++++--
 src/setup/sound.c     | 9 +++++++--
 6 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/pcsound/pcsound_sdl.c b/pcsound/pcsound_sdl.c
index 2a5b63d8..d38a97b8 100644
--- a/pcsound/pcsound_sdl.c
+++ b/pcsound/pcsound_sdl.c
@@ -18,8 +18,9 @@
 #include <stdio.h>
 #include <stdlib.h>

+#include "config.h"
+
 #include "SDL.h"
-#include "SDL_mixer.h"

 #include "pcsound.h"
 #include "pcsound_internal.h"
@@ -27,6 +28,8 @@

 #ifndef DISABLE_SDL2MIXER

+#include "SDL_mixer.h"
+

 #define MAX_SOUND_SLICE_TIME 70 /* ms */
 #define SQUARE_WAVE_AMP 0x2000
diff --git a/src/i_musicpack.c b/src/i_musicpack.c
index a8167736..ab27ba27 100644
--- a/src/i_musicpack.c
+++ b/src/i_musicpack.c
@@ -23,7 +23,6 @@
 #include <ctype.h>

 #include "SDL.h"
-#include "SDL_mixer.h"

 #include "i_glob.h"

@@ -50,6 +49,7 @@ char *music_pack_path = "";

 #ifndef DISABLE_SDL2MIXER

+#include "SDL_mixer.h"

 #define MID_HEADER_MAGIC "MThd"
 #define MUS_HEADER_MAGIC "MUS\x1a"
diff --git a/src/i_sdlmusic.c b/src/i_sdlmusic.c
index 08316327..313ca63c 100644
--- a/src/i_sdlmusic.c
+++ b/src/i_sdlmusic.c
@@ -23,7 +23,6 @@
 #include <ctype.h>

 #include "SDL.h"
-#include "SDL_mixer.h"

 #include "config.h"
 #include "doomtype.h"
@@ -125,6 +124,8 @@ void I_InitTimidityConfig(void)

 #ifndef DISABLE_SDL2MIXER

+#include "SDL_mixer.h"
+

 #define MAXMIDLENGTH (96 * 1024)

diff --git a/src/i_sdlsound.c b/src/i_sdlsound.c
index 26f4139c..18a51a09 100644
--- a/src/i_sdlsound.c
+++ b/src/i_sdlsound.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <assert.h>
 #include "SDL.h"
-#include "SDL_mixer.h"

 #ifdef HAVE_LIBSAMPLERATE
 #include <samplerate.h>
@@ -55,6 +54,8 @@ float libsamplerate_scale = 0.65f;

 #ifndef DISABLE_SDL2MIXER

+#include "SDL_mixer.h"
+

 #define LOW_PASS_FILTER
 //#define DEBUG_DUMP_WAVS
diff --git a/src/i_sound.c b/src/i_sound.c
index f08fb2c8..7a7bdb31 100644
--- a/src/i_sound.c
+++ b/src/i_sound.c
@@ -18,8 +18,6 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include "SDL_mixer.h"
-
 #include "config.h"
 #include "doomtype.h"

@@ -29,6 +27,13 @@
 #include "m_argv.h"
 #include "m_config.h"

+#ifndef DISABLE_SDL2MIXER
+
+#include "SDL_mixer.h"
+
+#endif  // DISABLE_SDL2MIXER
+
+
 // Sound sample rate to use for digital output (Hz)

 int snd_samplerate = 44100;
diff --git a/src/setup/sound.c b/src/setup/sound.c
index 885f3505..982ce00b 100644
--- a/src/setup/sound.c
+++ b/src/setup/sound.c
@@ -23,8 +23,6 @@
 #include <stdlib.h>
 #include <string.h>

-#include "SDL_mixer.h"
-
 #include "textscreen.h"
 #include "m_config.h"
 #include "m_misc.h"
@@ -33,6 +31,13 @@
 #include "mode.h"
 #include "sound.h"

+#ifndef DISABLE_SDL2MIXER
+
+#include "SDL_mixer.h"
+
+#endif  // DISABLE_SDL2MIXER
+
+
 #define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup-sound"

 typedef enum