From 16dad61ed00cc24f16a61c6088a7d2ec1f33fc90 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sat, 28 May 2022 03:20:02 +0300
Subject: [PATCH] removed libmikmod support for mod music playback .
---
CHANGES.txt | 3 +-
CMakeLists.txt | 3 +-
Makefile.os2 | 8 +-
SDL2_mixer.spec.in | 8 +-
VisualC-WinRT/SDL_mixer-UWP.vcxproj | 2 -
VisualC-WinRT/SDL_mixer-UWP.vcxproj.filters | 6 -
VisualC/SDL_mixer.vcxproj | 2 -
VisualC/SDL_mixer.vcxproj.filters | 6 -
Xcode/SDL_mixer.xcodeproj/project.pbxproj | 12 -
configure | 177 +------
configure.ac | 60 +--
include/SDL_mixer.h | 4 +-
src/codecs/music_mikmod.c | 522 --------------------
src/codecs/music_mikmod.h | 28 --
src/mixer.c | 1 -
src/music.c | 8 +-
src/music.h | 1 -
17 files changed, 33 insertions(+), 818 deletions(-)
delete mode 100644 src/codecs/music_mikmod.c
delete mode 100644 src/codecs/music_mikmod.h
diff --git a/CHANGES.txt b/CHANGES.txt
index 484deb9d..440170e0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,9 +14,8 @@
* Memory leak fixes and F32 format support to fluidsynth player.
* Fixes to opus playback on big-endian systems.
* Fixed distorted MIDI playback with FluidSynth if sample rate is out of library's limits
- * Added Mix_ModMusicJumpToOrder for mod music formats
+ * Added Mix_ModMusicJumpToOrder() for mod music formats
* Added libxmp support for mod music playback.
- * Fixed mikmod player reader issue with umx files
* Enabled module internal loops in modplug player
* Respect original mp3 file offset
* Fixed a use-after-free issue in fluidsynth player
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1e1a309..886cec4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,7 +114,6 @@ target_sources(SDL2_mixer PRIVATE
src/codecs/music_ogg.c
src/codecs/music_ogg_stb.c
src/codecs/music_opus.c
- src/codecs/music_mikmod.c
src/codecs/music_modplug.c
src/codecs/music_xmp.c
src/codecs/music_fluidsynth.c
@@ -178,7 +177,7 @@ if(BUILD_SHARED_LIBS)
set_target_properties(SDL2_mixer PROPERTIES PREFIX "")
endif()
if(APPLE)
- # TODO: Use DYLIB_COMPATIBILITY_VERSION, DYLIB_CURRENT_VERSION here
+ # TODO: Handle DYLIB_COMPATIBILITY_VERSION, DYLIB_CURRENT_VERSION here
endif()
if(WIN32)
target_compile_definitions(SDL2_mixer PRIVATE -DDLL_EXPORT)
diff --git a/Makefile.os2 b/Makefile.os2
index 6faf267d..888923a3 100644
--- a/Makefile.os2
+++ b/Makefile.os2
@@ -39,8 +39,6 @@ USE_DRMP3=no
USE_TIMIDITY=yes
# midi music support (using fluidsynth)
USE_FLUIDSYNTH=no
-# tracker music support (using libmikmod)
-USE_MIKMOD=no
# tracker music support (using libxmp)
USE_XMP=yes
# tracker music support (using libmodplug)
@@ -57,7 +55,7 @@ SRCS+= load_aiff.c load_voc.c music_wav.c &
music_ogg.c music_ogg_stb.c music_opus.c &
music_flac.c music_drflac.c mp3utils.c &
music_mpg123.c music_drmp3.c &
- music_xmp.c music_mikmod.c music_modplug.c &
+ music_xmp.c music_modplug.c &
music_fluidsynth.c music_timidity.c
# timidity sources:
TIMISRCS = common.c instrum.c mix.c output.c playmidi.c readmidi.c resample.c tables.c timidity.c
@@ -138,10 +136,6 @@ CFLAGS+= -DMUSIC_MP3_DRMP3
CFLAGS+= -DMUSIC_MOD_XMP
LIBS+= libxmp.lib
!endif
-!ifeq USE_MIKMOD yes
-CFLAGS+= -DMUSIC_MOD_MIKMOD
-LIBS+= mikmod.lib
-!endif
!ifeq USE_MODPLUG yes
CFLAGS+= -DMUSIC_MOD_MODPLUG
LIBS+= modplug.lib
diff --git a/SDL2_mixer.spec.in b/SDL2_mixer.spec.in
index 1929e084..672a6f33 100644
--- a/SDL2_mixer.spec.in
+++ b/SDL2_mixer.spec.in
@@ -15,8 +15,8 @@ Prefix: %{_prefix}
%description
Due to popular demand, here is a simple multi-channel audio mixer.
It supports 4 channels of 16 bit stereo audio, plus a single channel
-of music, mixed by the popular MikMod MOD, Timidity MIDI, Ogg Vorbis,
-Tremor, libmpg123 and libmad MP3 libraries.
+of music, mixed by the popular ModPlug, Timidity MIDI, Ogg Vorbis,
+Tremor, and libmpg123 MP3 libraries.
%package devel
Summary: Libraries, includes and more to develop SDL applications.
@@ -26,8 +26,8 @@ Requires: %{name}
%description devel
Due to popular demand, here is a simple multi-channel audio mixer.
It supports 4 channels of 16 bit stereo audio, plus a single channel
-of music, mixed by the popular MikMod MOD, Timidity MIDI, Ogg Vorbis,
-Tremor, libmpg123 and libmad MP3 libraries.
+of music, mixed by the popular ModPlug, Timidity MIDI, Ogg Vorbis,
+Tremor, and libmpg123 MP3 libraries.
%prep
%setup
diff --git a/VisualC-WinRT/SDL_mixer-UWP.vcxproj b/VisualC-WinRT/SDL_mixer-UWP.vcxproj
index 8226dbc7..dd9db236 100644
--- a/VisualC-WinRT/SDL_mixer-UWP.vcxproj
+++ b/VisualC-WinRT/SDL_mixer-UWP.vcxproj
@@ -43,7 +43,6 @@
<ClCompile Include="..\src\codecs\music_cmd.c" />
<ClCompile Include="..\src\codecs\music_flac.c" />
<ClCompile Include="..\src\codecs\music_fluidsynth.c" />
- <ClCompile Include="..\src\codecs\music_mikmod.c" />
<ClCompile Include="..\src\codecs\music_modplug.c" />
<ClCompile Include="..\src\codecs\music_mpg123.c" />
<ClCompile Include="..\src\codecs\music_nativemidi.c" />
@@ -71,7 +70,6 @@
<ClInclude Include="..\src\codecs\music_drmp3.h" />
<ClInclude Include="..\src\codecs\music_flac.h" />
<ClInclude Include="..\src\codecs\music_fluidsynth.h" />
- <ClInclude Include="..\src\codecs\music_mikmod.h" />
<ClInclude Include="..\src\codecs\music_modplug.h" />
<ClInclude Include="..\src\codecs\music_mpg123.h" />
<ClInclude Include="..\src\codecs\music_nativemidi.h" />
diff --git a/VisualC-WinRT/SDL_mixer-UWP.vcxproj.filters b/VisualC-WinRT/SDL_mixer-UWP.vcxproj.filters
index 47a10d25..f8c1806b 100644
--- a/VisualC-WinRT/SDL_mixer-UWP.vcxproj.filters
+++ b/VisualC-WinRT/SDL_mixer-UWP.vcxproj.filters
@@ -61,9 +61,6 @@
<ClCompile Include="..\src\codecs\music_fluidsynth.c">
<Filter>Sources</Filter>
</ClCompile>
- <ClCompile Include="..\src\codecs\music_mikmod.c">
- <Filter>Sources</Filter>
- </ClCompile>
<ClCompile Include="..\src\codecs\music_modplug.c">
<Filter>Sources</Filter>
</ClCompile>
@@ -162,9 +159,6 @@
<ClInclude Include="..\src\codecs\music_fluidsynth.h">
<Filter>Sources</Filter>
</ClInclude>
- <ClInclude Include="..\src\codecs\music_mikmod.h">
- <Filter>Sources</Filter>
- </ClInclude>
<ClInclude Include="..\src\codecs\music_modplug.h">
<Filter>Sources</Filter>
</ClInclude>
diff --git a/VisualC/SDL_mixer.vcxproj b/VisualC/SDL_mixer.vcxproj
index 57b9eacb..16a59131 100644
--- a/VisualC/SDL_mixer.vcxproj
+++ b/VisualC/SDL_mixer.vcxproj
@@ -224,7 +224,6 @@
<ClInclude Include="..\src\codecs\music_cmd.h" />
<ClInclude Include="..\src\codecs\music_flac.h" />
<ClInclude Include="..\src\codecs\music_fluidsynth.h" />
- <ClInclude Include="..\src\codecs\music_mikmod.h" />
<ClInclude Include="..\src\codecs\music_modplug.h" />
<ClInclude Include="..\src\codecs\music_mpg123.h" />
<ClInclude Include="..\src\codecs\music_nativemidi.h" />
@@ -414,7 +413,6 @@
<ClCompile Include="..\src\codecs\music_cmd.c" />
<ClCompile Include="..\src\codecs\music_flac.c" />
<ClCompile Include="..\src\codecs\music_fluidsynth.c" />
- <ClCompile Include="..\src\codecs\music_mikmod.c" />
<ClCompile Include="..\src\codecs\music_modplug.c" />
<ClCompile Include="..\src\codecs\music_mpg123.c" />
<ClCompile Include="..\src\codecs\music_nativemidi.c" />
diff --git a/VisualC/SDL_mixer.vcxproj.filters b/VisualC/SDL_mixer.vcxproj.filters
index c35ae5d3..b78b0fb8 100644
--- a/VisualC/SDL_mixer.vcxproj.filters
+++ b/VisualC/SDL_mixer.vcxproj.filters
@@ -34,9 +34,6 @@
<ClInclude Include="..\src\codecs\music_fluidsynth.h">
<Filter>Sources</Filter>
</ClInclude>
- <ClInclude Include="..\src\codecs\music_mikmod.h">
- <Filter>Sources</Filter>
- </ClInclude>
<ClInclude Include="..\src\codecs\music_modplug.h">
<Filter>Sources</Filter>
</ClInclude>
@@ -176,9 +173,6 @@
<ClCompile Include="..\src\codecs\music_fluidsynth.c">
<Filter>Sources</Filter>
</ClCompile>
- <ClCompile Include="..\src\codecs\music_mikmod.c">
- <Filter>Sources</Filter>
- </ClCompile>
<ClCompile Include="..\src\codecs\music_modplug.c">
<Filter>Sources</Filter>
</ClCompile>
diff --git a/Xcode/SDL_mixer.xcodeproj/project.pbxproj b/Xcode/SDL_mixer.xcodeproj/project.pbxproj
index 2e2fdf96..a680e556 100644
--- a/Xcode/SDL_mixer.xcodeproj/project.pbxproj
+++ b/Xcode/SDL_mixer.xcodeproj/project.pbxproj
@@ -30,7 +30,6 @@
AAE405F01F9607C300EDAF53 /* load_voc.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405CC1F9607C000EDAF53 /* load_voc.c */; };
AAE405F11F9607C300EDAF53 /* music.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405CD1F9607C000EDAF53 /* music.c */; };
AAE405F21F9607C300EDAF53 /* effects_internal.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405CE1F9607C100EDAF53 /* effects_internal.c */; };
- AAE405F31F9607C300EDAF53 /* music_mikmod.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405CF1F9607C100EDAF53 /* music_mikmod.h */; };
AAE405F41F9607C300EDAF53 /* effect_position.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405D01F9607C100EDAF53 /* effect_position.c */; };
AAE405F51F9607C300EDAF53 /* music_ogg.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405D11F9607C100EDAF53 /* music_ogg.h */; };
AAE405F61F9607C300EDAF53 /* load_aiff.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405D21F9607C100EDAF53 /* load_aiff.h */; };
@@ -39,7 +38,6 @@
AAE405F91F9607C300EDAF53 /* music_nativemidi.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405D51F9607C100EDAF53 /* music_nativemidi.c */; };
AAE405FA1F9607C300EDAF53 /* music_timidity.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405D61F9607C100EDAF53 /* music_timidity.h */; };
AAE405FB1F9607C300EDAF53 /* music_timidity.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405D71F9607C200EDAF53 /* music_timidity.c */; };
- AAE405FC1F9607C300EDAF53 /* music_mikmod.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405D81F9607C200EDAF53 /* music_mikmod.c */; };
AAE405FD1F9607C300EDAF53 /* music_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405D91F9607C200EDAF53 /* music_ogg.c */; };
AAE405FE1F9607C300EDAF53 /* music_nativemidi.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405DA1F9607C200EDAF53 /* music_nativemidi.h */; };
AAE405FF1F9607C300EDAF53 /* music_cmd.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405DB1F9607C200EDAF53 /* music_cmd.h */; };
@@ -76,8 +74,6 @@
F3823346273195F300F7F527 /* music_flac.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405C71F9607C000EDAF53 /* music_flac.h */; };
F3823347273195F500F7F527 /* music_fluidsynth.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405C61F9607C000EDAF53 /* music_fluidsynth.c */; };
F3823348273195F800F7F527 /* music_fluidsynth.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405BF1F9607BF00EDAF53 /* music_fluidsynth.h */; };
- F382334B2731960000F7F527 /* music_mikmod.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405D81F9607C200EDAF53 /* music_mikmod.c */; };
- F382334C2731960200F7F527 /* music_mikmod.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405CF1F9607C100EDAF53 /* music_mikmod.h */; };
F382334D2731960400F7F527 /* music_modplug.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405C41F9607C000EDAF53 /* music_modplug.c */; };
F382334E2731960700F7F527 /* music_modplug.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405C51F9607C000EDAF53 /* music_modplug.h */; };
F382334F2731960C00F7F527 /* music_mpg123.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405DF1F9607C300EDAF53 /* music_mpg123.c */; };
@@ -152,7 +148,6 @@
AAE405CC1F9607C000EDAF53 /* load_voc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = load_voc.c; sourceTree = "<group>"; };
AAE405CD1F9607C000EDAF53 /* music.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = music.c; sourceTree = "<group>"; };
AAE405CE1F9607C100EDAF53 /* effects_internal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = effects_internal.c; sourceTree = "<group>"; };
- AAE405CF1F9607C100EDAF53 /* music_mikmod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music_mikmod.h; sourceTree = "<group>"; };
AAE405D01F9607C100EDAF53 /* effect_position.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = effect_position.c; sourceTree = "<group>"; };
AAE405D11F9607C100EDAF53 /* music_ogg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music_ogg.h; sourceTree = "<group>"; };
AAE405D21F9607C100EDAF53 /* load_aiff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = load_aiff.h; sourceTree = "<group>"; };
@@ -161,7 +156,6 @@
AAE405D51F9607C100EDAF53 /* music_nativemidi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = music_nativemidi.c; sourceTree = "<group>"; };
AAE405D61F9607C100EDAF53 /* music_timidity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music_timidity.h; sourceTree = "<group>"; };
AAE405D71F9607C200EDAF53 /* music_timidity.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = music_timidity.c; sourceTree = "<group>"; };
- AAE405D81F9607C200EDAF53 /* music_mikmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = music_mikmod.c; sourceTree = "<group>"; };
AAE405D91F9607C200EDAF53 /* music_ogg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = music_ogg.c; sourceTree = "<group>"; };
AAE405DA1F9607C200EDAF53 /* music_nativemidi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music_nativemidi.h; sourceTree = "<group>"; };
AAE405DB1F9607C200EDAF53 /* music_cmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music_cmd.h; sourceTree = "<group>"; };
@@ -285,8 +279,6 @@
AAE405C71F9607C000EDAF53 /* music_flac.h */,
AAE405C61F9607C000EDAF53 /* music_fluidsynth.c */,
AAE405BF1F9607BF00EDAF53 /* music_fluidsynth.h */,
- AAE405D81F9607C200EDAF53 /* music_mikmod.c */,
- AAE405CF1F9607C100EDAF53 /* music_mikmod.h */,
AAE405C41F9607C000EDAF53 /* music_modplug.c */,
AAE405C51F9607C000EDAF53 /* music_modplug.h */,
AAE405DF1F9607C300EDAF53 /* music_mpg123.c */,
@@ -388,7 +380,6 @@
buildActionMask = 2147483647;
files = (
AAE405E31F9607C300EDAF53 /* music_fluidsynth.h in Headers */,
- AAE405F31F9607C300EDAF53 /* music_mikmod.h in Headers */,
AAE405F61F9607C300EDAF53 /* load_aiff.h in Headers */,
AAE405E71F9607C300EDAF53 /* load_voc.h in Headers */,
AAE405EC1F9607C300EDAF53 /* music_wav.h in Headers */,
@@ -425,7 +416,6 @@
F382334E2731960700F7F527 /* music_modplug.h in Headers */,
F3823340273195E400F7F527 /* music.h in Headers */,
F38233522731961400F7F527 /* music_nativemidi.h in Headers */,
- F382334C2731960200F7F527 /* music_mikmod.h in Headers */,
F3823338273195CF00F7F527 /* utils.h in Headers */,
F38233562731961C00F7F527 /* music_timidity.h in Headers */,
F38233542731961800F7F527 /* music_ogg.h in Headers */,
@@ -617,7 +607,6 @@
AAE405E21F9607C300EDAF53 /* load_aiff.c in Sources */,
F37A8D2F2838924900C38E95 /* music_drmp3.c in Sources */,
AAE405F01F9607C300EDAF53 /* load_voc.c in Sources */,
- AAE405FC1F9607C300EDAF53 /* music_mikmod.c in Sources */,
AAE405EA1F9607C300EDAF53 /* music_fluidsynth.c in Sources */,
AAE405FD1F9607C300EDAF53 /* music_ogg.c in Sources */,
AAE405F41F9607C300EDAF53 /* effect_position.c in Sources */,
@@ -654,7 +643,6 @@
F382335B2731962900F7F527 /* load_voc.c in Sources */,
F382334D2731960400F7F527 /* music_modplug.c in Sources */,
F382333F273195E100F7F527 /* music.c in Sources */,
- F382334B2731960000F7F527 /* music_mikmod.c in Sources */,
F37A8DB62838AD1300C38E95 /* music_ogg_stb.c in Sources */,
F37A8D512838A23400C38E95 /* music_drflac.c in Sources */,
F3823341273195E600F7F527 /* mp3utils.c in Sources */,
diff --git a/configure b/configure
index ed42f0ef..29824f82 100755
--- a/configure
+++ b/configure
@@ -797,9 +797,6 @@ FLUIDSYNTH_LIBS
FLUIDSYNTH_CFLAGS
XMP_LIBS
XMP_CFLAGS
-LIBMIKMOD_LIBS
-LIBMIKMOD_CFLAGS
-LIBMIKMOD_CONFIG
MODPLUG_LIBS
MODPLUG_CFLAGS
SDL2_CONFIG
@@ -922,8 +919,6 @@ enable_music_wave
enable_music_mod
enable_music_mod_modplug
enable_music_mod_modplug_shared
-enable_music_mod_mikmod
-enable_music_mod_mikmod_shared
enable_music_mod_xmp
enable_music_mod_xmp_lite
enable_music_mod_xmp_shared
@@ -1610,10 +1605,6 @@ Optional Features:
enable MOD music via modplug [default=yes]
--enable-music-mod-modplug-shared
dynamically load modplug library [default=yes]
- --enable-music-mod-mikmod
- enable MOD music via mikmod [default=no]
- --enable-music-mod-mikmod-shared
- dynamically load mikmod library [default=yes]
--enable-music-mod-xmp enable MOD music via libxmp [default=no]
--enable-music-mod-xmp-lite
use libxmp-lite instead of libxmp [default=no]
@@ -4136,13 +4127,13 @@ if ${lt_cv_nm_interface+:} false; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4139: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4130: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4142: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4133: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4145: output\"" >&5)
+ (eval echo "\"\$as_me:4136: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5356,7 +5347,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5359 "configure"' > conftest.$ac_ext
+ echo '#line 5350 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7181,11 +7172,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7184: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7175: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7188: \$? = $ac_status" >&5
+ echo "$as_me:7179: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7530,11 +7521,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7533: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7524: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7537: \$? = $ac_status" >&5
+ echo "$as_me:7528: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7635,11 +7626,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7638: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7629: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7642: \$? = $ac_status" >&5
+ echo "$as_me:7633: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7690,11 +7681,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7693: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7684: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7697: \$? = $ac_status" >&5
+ echo "$as_me:7688: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10125,7 +10116,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10128 "configure"
+#line 10119 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10221,7 +10212,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10224 "configure"
+#line 10215 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13465,11 +13456,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13468: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13459: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13472: \$? = $ac_status" >&5
+ echo "$as_me:13463: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13564,11 +13555,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13567: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13558: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13571: \$? = $ac_status" >&5
+ echo "$as_me:13562: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13616,11 +13607,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13619: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13610: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13623: \$? = $ac_status" >&5
+ echo "$as_me:13614: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16010,132 +16001,6 @@ $as_echo "$as_me: WARNING: *** Unable to find ModPlug library (http://modplug-xm
fi
fi
-# Check whether --enable-music-mod-mikmod was given.
-if test "${enable_music_mod_mikmod+set}" = set; then :
- enableval=$enable_music_mod_mikmod;
-else
- enable_music_mod_mikmod=no
-fi
-
-# Check whether --enable-music-mod-mikmod-shared was given.
-if test "${enable_music_mod_mikmod_shared+set}" = set; then :
- enableval=$enable_music_mod_mikmod_shared;
-else
- enable_music_mod_mikmod_shared=yes
-fi
-
-if test x$enable_music_mod = xyes -a x$enable_music_mod_mikmod = xyes; then
- # Extract the first word of "libmikmod-config", so it can be a program name with args.
-set dummy libmikmod-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LIBMIKMOD_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $LIBMIKMOD_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_LIBMIKMOD_CONFIG="$LIBMIKMOD_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_LIBMIKMOD_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_LIBMIKMOD_CONFIG" && ac_cv_path_LIBMIKMOD_CONFIG="no"
- ;;
-esac
-fi
-LIBMIKMOD_CONFIG=$ac_cv_path_LIBMIKMOD_CONFIG
-if test -n "$LIBMIKMOD_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBMIKMOD_CONFIG" >&5
-$as_echo "$LIBMIKMOD_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
- if test "$LIBMIKMOD_CONFIG" != "no" ; then
- test -z "$LIBMIKMOD_CFLAGS" && LIBMIKMOD_CFLAGS=`$LIBMIKMOD_CONFIG --cflags`
- test -z "$LIBMIKMOD_LIBS" && LIBMIKMOD_LIBS=`$LIBMIKMOD_CONFIG --libs`
- fi
- CFLAGS_SAVED="$CFLAGS"
- LIBS_SAVED="$LIBS"
- CFLAGS="$CFLAGS $LIBMIKMOD_CFLAGS"
- LIBS="$LIBS $LIBMIKMOD_LIBS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmikmod >= 3.1.10" >&5
-$as_echo_n "checking for libmikmod >= 3.1.10... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <mikmod.h>
-int
-main ()
-{
-
-#if (LIBMIKMOD_VERSION < 0x03010a)
-choke me
-#endif
-Player_LoadGeneric(NULL,0,0);
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- have_libmikmod=yes
-else
- have_libmikmod=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- CFLAGS="$CFLAGS_SAVED"
- LIBS="$LIBS_SAVED"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_libmikmod" >&5
-$as_echo "$have_libmikmod" >&6; }
-
- if test x$have_libmikmod = xyes; then
- case "$host" in
- *-*-darwin*)
- mikmod_lib=`find_lib libmikmod.dylib`
- ;;
- *-*-cygwin* | *-*-mingw*)
- mikmod_lib=`find_lib "libmikmod*.dll"`
- ;;
- *)
- mikmod_lib=`find_lib "libmikmod[0-9]*.so.*"`
- if test x$mikmod_lib = x; then
- mikmod_lib=`find_lib "libmikmod.so.*"`
- fi
- ;;
- esac
- EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MOD_MIKMOD $LIBMIKMOD_CFLAGS"
- if test x$enable_music_mod_mikmod_shared = xyes && test x$mikmod_lib != x; then
- echo "-- dynamic libmikmod -> $mikmod_lib"
- EXTRA_CFLAGS="$EXTRA_CFLAGS -DMIKMOD_DYNAMIC=\\\"$mikmod_lib\\\""
- else
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LIBMIKMOD_LIBS"
- PC_LIBS="$PC_LIBS $LIBMIKMOD_LIBS"
- fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Unable to find MikMod library (http://mikmod.sourceforge.net/)" >&5
-$as_echo "$as_me: WARNING: *** Unable to find MikMod library (http://mikmod.sourceforge.net/)" >&2;}
- fi
-fi
-
# Check whether --enable-music-mod-xmp was given.
if test "${enable_music_mod_xmp+set}" = set; then :
enableval=$enable_music_mod_xmp;
@@ -16363,7 +16228,7 @@ $as_echo "$as_me: WARNING: *** Unable to find xmp library (http://xmp.sourceforg
fi
fi
-if test x$have_libmodplug != xyes -a x$have_libmikmod != xyes -a x$have_libxmp != xyes; then
+if test x$have_libmodplug != xyes -a x$have_libxmp != xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MOD support disabled" >&5
$as_echo "$as_me: WARNING: MOD support disabled" >&2;}
fi
diff --git a/configure.ac b/configure.ac
index a0195673..66c65dde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -371,64 +371,6 @@ if test x$enable_music_mod = xyes -a x$enable_music_mod_modplug = xyes; then
fi
fi
-AC_ARG_ENABLE([music-mod-mikmod],
-[AS_HELP_STRING([--enable-music-mod-mikmod], [enable MOD music via mikmod [default=no]])],
- [], [enable_music_mod_mikmod=no])
-AC_ARG_ENABLE([music-mod-mikmod-shared],
-[AS_HELP_STRING([--enable-music-mod-mikmod-shared], [dynamically load mikmod library [default=yes]])],
- [], [enable_music_mod_mikmod_shared=yes])
-if test x$enable_music_mod = xyes -a x$enable_music_mod_mikmod = xyes; then
- AC_PATH_PROG(LIBMIKMOD_CONFIG, libmikmod-config, no, [$PATH])
- AC_SUBST(LIBMIKMOD_CFLAGS)
- AC_SUBST(LIBMIKMOD_LIBS)
- if test "$LIBMIKMOD_CONFIG" != "no" ; then
- test -z "$LIBMIKMOD_CFLAGS" && LIBMIKMOD_CFLAGS=`$LIBMIKMOD_CONFIG --cflags`
- test -z "$LIBMIKMOD_LIBS" && LIBMIKMOD_LIBS=`$LIBMIKMOD_CONFIG --libs`
- fi
- CFLAGS_SAVED="$CFLAGS"
- LIBS_SAVED="$LIBS"
- CFLAGS="$CFLAGS $LIBMIKMOD_CFLAGS"
- LIBS="$LIBS $LIBMIKMOD_LIBS"
- AC_MSG_CHECKING([for libmikmod >= 3.1.10])
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <mikmod.h>]],[[
-#if (LIBMIKMOD_VERSION < 0x03010a)
-choke me
-#endif
-Player_LoadGeneric(NULL,0,0);
-]])], [have_libmikmod=yes],[have_libmikmod=no])
-
- CFLAGS="$CFLAGS_SAVED"
- LIBS="$LIBS_SAVED"
- AC_MSG_RESULT($have_libmikmod)
-
- if test x$have_libmikmod = xyes; then
- case "$host" in
- *-*-darwin*)
- mikmod_lib=[`find_lib libmikmod.dylib`]
- ;;
- *-*-cygwin* | *-*-mingw*)
- mikmod_lib=[`find_lib "libmikmod*.dll"`]
- ;;
- *)
- mikmod_lib=[`find_lib "libmikmod[0-9]*.so.*"`]
- if test x$mikmod_lib = x; then
- mikmod_lib=[`find_lib "libmikmod.so.*"`]
- fi
- ;;
- esac
- EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MOD_MIKMOD $LIBMIKMOD_CFLAGS"
- if test x$enable_music_mod_mikmod_shared = xyes && test x$mikmod_lib != x; then
- echo "-- dynamic libmikmod -> $mikmod_lib"
- EXTRA_CFLAGS="$EXTRA_CFLAGS -DMIKMOD_DYNAMIC=\\\"$mikmod_lib\\\""
- else
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LIBMIKMOD_LIBS"
- PC_LIBS="$PC_LIBS $LIBMIKMOD_LIBS"
- fi
- else
- AC_MSG_WARN([*** Unable to find MikMod library (http://mikmod.sourceforge.net/)])
- fi
-fi
-
AC_ARG_ENABLE([music-mod-xmp],
[AS_HELP_STRING([--enable-music-mod-xmp], [enable MOD music via libxmp [default=no]])],
[], [enable_music_mod_xmp=no])
@@ -485,7 +427,7 @@ if test x$enable_music_mod = xyes -a x$enable_music_mod_xmp = xyes; then
fi
fi
-
(Patch may be truncated, please check the link at the top of this post.)