Removed MikMod support.

ModPlug covers this well enough and is public domain, so we can build it in-tree.
icculus · Jul 14, 2018 · f2867f6 · f2867f6
1 parent 7783875
commit f2867f6
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 489 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -52,7 +52,6 @@ sdlsound_decoder_option(RAW "raw PCM audio" ".RAW")
 sdlsound_decoder_option(SHN "Shorten" ".SHN")
 sdlsound_decoder_option(SPEEX "Speex" ".SPEEX")
 sdlsound_decoder_option(MODPLUG "ModPlug" "various tracker formats")
-sdlsound_decoder_option(MIKMOD "MikMod" "various tracker formats")
 
 if(APPLE)
     sdlsound_decoder_option(COREAUDIO "CoreAudio" "various audio formats")
@@ -109,7 +108,6 @@ set(SDLSOUND_SRCS
     src/SDL_sound_au.c
     src/SDL_sound_coreaudio.c
     src/SDL_sound_flac.c
-    src/SDL_sound_mikmod.c
     src/SDL_sound_modplug.c
     src/SDL_sound_ogg.c
     src/SDL_sound_raw.c
@@ -231,7 +229,6 @@ message_bool_option("RAW support" SDLSOUND_DECODER_RAW)
 message_bool_option("SHN support" SDLSOUND_DECODER_SHN)
 message_bool_option("SPEEX support" SDLSOUND_DECODER_SPEEX)
 message_bool_option("MODPLUG support" SDLSOUND_DECODER_MODPLUG)
-message_bool_option("MIKMOD support" SDLSOUND_DECODER_MIKMOD)
 message_bool_option("COREAUDIO support" SDLSOUND_DECODER_COREAUDIO)
 message_bool_option("Build static library" SDLSOUND_BUILD_STATIC)
 message_bool_option("Build shared library" SDLSOUND_BUILD_SHARED)

diff --git a/src/SDL_sound.c b/src/SDL_sound.c
@@ -22,7 +22,6 @@
 /* The various decoder drivers... */
 
 /* All these externs may be missing; we check SOUND_SUPPORTS_xxx before use. */
-extern const Sound_DecoderFunctions __Sound_DecoderFunctions_MIKMOD;
 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_MODPLUG;
 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_WAV;
 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_AIFF;
@@ -47,9 +46,6 @@ static decoder_element decoders[] =
 #if SOUND_SUPPORTS_MODPLUG
     { 0, &__Sound_DecoderFunctions_MODPLUG },
 #endif
-#if SOUND_SUPPORTS_MIKMOD
-    { 0, &__Sound_DecoderFunctions_MIKMOD },
-#endif
 #if SOUND_SUPPORTS_WAV
     { 0, &__Sound_DecoderFunctions_WAV },
 #endif

diff --git a/src/SDL_sound.h b/src/SDL_sound.h
@@ -31,7 +31,7 @@
  *   - .VOC  (Creative Labs' Voice format, internal.)
  *   - .MP3  (MPEG-1 Layer 3 support, via libmpg123.)
  *   - .MID  (MIDI music converted to Waveform data, internal.)
- *   - .MOD  (MOD files, via MikMod and ModPlug.)
+ *   - .MOD  (MOD files, via internal copy of libModPlug.)
  *   - .OGG  (Ogg files, via Ogg Vorbis libraries.)
  *   - .SPX  (Speex files, via libspeex.)
  *   - .SHN  (Shorten files, internal.)

diff --git a/src/SDL_sound_internal.h b/src/SDL_sound_internal.h
@@ -58,9 +58,6 @@
 #ifndef SOUND_SUPPORTS_MODPLUG
 #define SOUND_SUPPORTS_MODPLUG 1
 #endif
-#ifndef SOUND_SUPPORTS_MIKMOD
-#define SOUND_SUPPORTS_MIKMOD 1
-#endif
 #ifndef SOUND_SUPPORTS_WAV
 #define SOUND_SUPPORTS_WAV 1
 #endif