Skip to content

Commit 793d8e6

Browse files
sezerosezero
committed
remove libmodplug support.
1 parent 5ee0e7f commit 793d8e6

File tree

18 files changed

+6
-714
lines changed

18 files changed

+6
-714
lines changed

‎CMakeLists.txt

Lines changed: 3 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,12 @@ option(SDLMIXER_GME_SHARED "Dynamically load libgme" "${SDLMIXER_DEPS_SHARED}")
138138

139139
option(SDLMIXER_MOD "Support loading MOD music" ON)
140140

141-
cmake_dependent_option(SDLMIXER_MOD_MODPLUG "Support loading MOD music via modplug" OFF SDLMIXER_MOD OFF)
142-
cmake_dependent_option(SDLMIXER_MOD_MODPLUG_SHARED "Dynamically load modplug" "${SDLMIXER_DEPS_SHARED}" SDLMIXER_MOD_MODPLUG OFF)
143-
144141
cmake_dependent_option(SDLMIXER_MOD_XMP "Support loading MOD music via libxmp" ON SDLMIXER_MOD OFF)
145142
cmake_dependent_option(SDLMIXER_MOD_XMP_LITE "Use libxmp-lite instead of libxmp" OFF "SDLMIXER_MOD_XMP;NOT SDLMIXER_VENDORED" OFF)
146143
cmake_dependent_option(SDLMIXER_MOD_XMP_SHARED "Dynamically load libxmp(-lite)" "${SDLMIXER_DEPS_SHARED}" SDLMIXER_MOD_XMP OFF)
147144

148-
if(SDLMIXER_MOD AND NOT (SDLMIXER_MOD_MODPLUG OR SDLMIXER_MOD_XMP))
149-
message(FATAL_ERROR "MOD support was enabled (SDLMIXER_MOD) but neither modplug (SDLMIXER_MOD_MODPLUG) or xmp (SDLMIXER_MOD_XMP) was enabled.")
145+
if(SDLMIXER_MOD AND NOT SDLMIXER_MOD_XMP)
146+
message(FATAL_ERROR "MOD support was enabled (SDLMIXER_MOD) but xmp (SDLMIXER_MOD_XMP) was enabled.")
150147
endif()
151148

152149
option(SDLMIXER_MP3 "Enable MP3 music" ON)
@@ -258,7 +255,6 @@ add_library(${sdl3_mixer_target_name}
258255
src/codecs/music_fluidsynth.c
259256
src/codecs/music_gme.c
260257
src/codecs/music_minimp3.c
261-
src/codecs/music_modplug.c
262258
src/codecs/music_mpg123.c
263259
src/codecs/music_nativemidi.c
264260
src/codecs/music_ogg.c
@@ -743,44 +739,6 @@ if(SDLMIXER_GME)
743739
endif()
744740
endif()
745741

746-
list(APPEND SDLMIXER_BACKENDS MOD_MODPLUG)
747-
set(SDLMIXER_MOD_MODPLUG_ENABLED FALSE)
748-
if(SDLMIXER_MOD_MODPLUG)
749-
if(SDLMIXER_VENDORED)
750-
message(STATUS "Using vendored libmodplug")
751-
message(${fatal_error} "libmodplug is not vendored.")
752-
else()
753-
find_package(modplug ${required})
754-
if(modplug_FOUND)
755-
set(SDLMIXER_MOD_MODPLUG_ENABLED TRUE)
756-
message(STATUS "Using system libmodplug")
757-
if(NOT SDLMIXER_MOD_MODPLUG_SHARED)
758-
list(APPEND PC_REQUIRES libmodplug)
759-
endif()
760-
else()
761-
message(${fatal_error} "libmodplug NOT found")
762-
endif()
763-
endif()
764-
if(SDLMIXER_MOD_MODPLUG_ENABLED)
765-
target_compile_definitions(${sdl3_mixer_target_name} PRIVATE MUSIC_MOD_MODPLUG)
766-
if(SDLMIXER_MOD_MODPLUG_SHARED)
767-
target_include_directories(${sdl3_mixer_target_name} PRIVATE
768-
$<TARGET_PROPERTY:modplug::modplug,INCLUDE_DIRECTORIES>
769-
$<TARGET_PROPERTY:modplug::modplug,INTERFACE_INCLUDE_DIRECTORIES>
770-
$<TARGET_PROPERTY:modplug::modplug,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
771-
)
772-
target_get_dynamic_library(dynamic_modplug modplug::modplug)
773-
message(STATUS "Dynamic modplug: ${dynamic_modplug}")
774-
target_compile_definitions(${sdl3_mixer_target_name} PRIVATE "MODPLUG_DYNAMIC=\"${dynamic_modplug}\"")
775-
if(SDLMIXER_VENDORED)
776-
add_dependencies(${sdl3_mixer_target_name} modplug::modplug)
777-
endif()
778-
else()
779-
target_link_libraries(${sdl3_mixer_target_name} PRIVATE modplug::modplug)
780-
endif()
781-
endif()
782-
endif()
783-
784742
list(APPEND SDLMIXER_BACKENDS MOD_XMP)
785743
set(SDLMIXER_MOD_XMP_ENABLED FALSE)
786744
if(SDLMIXER_MOD_XMP)
@@ -863,7 +821,7 @@ if(SDLMIXER_MOD_XMP)
863821
endif()
864822

865823
set(SDLMIXER_MOD_ENABLED FALSE)
866-
if(SDLMIXER_MOD_MODPLUG_ENABLED OR SDLMIXER_MOD_XMP_ENABLED OR SDLMIXER_MOD_XMP_ENABLED)
824+
if(SDLMIXER_MOD_XMP_ENABLED)
867825
set(SDLMIXER_MOD_ENABLED TRUE)
868826
endif()
869827

@@ -1164,7 +1122,6 @@ if(SDLMIXER_INSTALL)
11641122
cmake/Findgme.cmake
11651123
cmake/Findlibxmp.cmake
11661124
cmake/Findlibxmp-lite.cmake
1167-
cmake/Findmodplug.cmake
11681125
cmake/FindOgg.cmake
11691126
cmake/FindOpus.cmake
11701127
cmake/FindOpusFile.cmake

‎VisualC/SDL_mixer.vcxproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@
226226
<ClInclude Include="..\src\codecs\music_fluidsynth.h" />
227227
<ClInclude Include="..\src\codecs\music_gme.h" />
228228
<ClInclude Include="..\src\codecs\music_minimp3.h" />
229-
<ClInclude Include="..\src\codecs\music_modplug.h" />
230229
<ClInclude Include="..\src\codecs\music_mpg123.h" />
231230
<ClInclude Include="..\src\codecs\music_nativemidi.h" />
232231
<ClInclude Include="..\src\codecs\music_ogg.h" />
@@ -450,7 +449,6 @@
450449
<ClCompile Include="..\src\codecs\music_fluidsynth.c" />
451450
<ClCompile Include="..\src\codecs\music_gme.c" />
452451
<ClCompile Include="..\src\codecs\music_minimp3.c" />
453-
<ClCompile Include="..\src\codecs\music_modplug.c" />
454452
<ClCompile Include="..\src\codecs\music_mpg123.c" />
455453
<ClCompile Include="..\src\codecs\music_nativemidi.c" />
456454
<ClCompile Include="..\src\codecs\music_ogg.c" />

‎VisualC/SDL_mixer.vcxproj.filters

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@
4343
<ClInclude Include="..\src\codecs\music_minimp3.h">
4444
<Filter>Sources</Filter>
4545
</ClInclude>
46-
<ClInclude Include="..\src\codecs\music_modplug.h">
47-
<Filter>Sources</Filter>
48-
</ClInclude>
4946
<ClInclude Include="..\src\codecs\music_mpg123.h">
5047
<Filter>Sources</Filter>
5148
</ClInclude>
@@ -179,9 +176,6 @@
179176
<ClCompile Include="..\src\codecs\music_minimp3.c">
180177
<Filter>Sources</Filter>
181178
</ClCompile>
182-
<ClCompile Include="..\src\codecs\music_modplug.c">
183-
<Filter>Sources</Filter>
184-
</ClCompile>
185179
<ClCompile Include="..\src\codecs\music_mpg123.c">
186180
<Filter>Sources</Filter>
187181
</ClCompile>

‎VisualC/external/include/libmodplug/modplug.h

Lines changed: 0 additions & 173 deletions
This file was deleted.

‎Xcode/SDL_mixer.xcodeproj/project.pbxproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@
5151
AAE405E51F9607C300EDAF53 /* mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405C11F9607C000EDAF53 /* mixer.c */; };
5252
AAE405E61F9607C300EDAF53 /* music.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405C21F9607C000EDAF53 /* music.h */; };
5353
AAE405E71F9607C300EDAF53 /* load_voc.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405C31F9607C000EDAF53 /* load_voc.h */; };
54-
AAE405E81F9607C300EDAF53 /* music_modplug.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405C41F9607C000EDAF53 /* music_modplug.c */; };
55-
AAE405E91F9607C300EDAF53 /* music_modplug.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405C51F9607C000EDAF53 /* music_modplug.h */; };
5654
AAE405EA1F9607C300EDAF53 /* music_fluidsynth.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405C61F9607C000EDAF53 /* music_fluidsynth.c */; };
5755
AAE405EB1F9607C300EDAF53 /* music_flac.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405C71F9607C000EDAF53 /* music_flac.h */; };
5856
AAE405EC1F9607C300EDAF53 /* music_wav.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405C81F9607C000EDAF53 /* music_wav.h */; };
@@ -190,8 +188,6 @@
190188
AAE405C11F9607C000EDAF53 /* mixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mixer.c; sourceTree = "<group>"; };
191189
AAE405C21F9607C000EDAF53 /* music.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music.h; sourceTree = "<group>"; };
192190
AAE405C31F9607C000EDAF53 /* load_voc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = load_voc.h; sourceTree = "<group>"; };
193-
AAE405C41F9607C000EDAF53 /* music_modplug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = music_modplug.c; sourceTree = "<group>"; };
194-
AAE405C51F9607C000EDAF53 /* music_modplug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music_modplug.h; sourceTree = "<group>"; };
195191
AAE405C61F9607C000EDAF53 /* music_fluidsynth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = music_fluidsynth.c; sourceTree = "<group>"; };
196192
AAE405C71F9607C000EDAF53 /* music_flac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music_flac.h; sourceTree = "<group>"; };
197193
AAE405C81F9607C000EDAF53 /* music_wav.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music_wav.h; sourceTree = "<group>"; };
@@ -334,8 +330,6 @@
334330
F3F8794A29B30FDA0007FDA1 /* music_gme.h */,
335331
F307A52D2B5473760012534B /* music_minimp3.c */,
336332
F307A52E2B5473760012534B /* music_minimp3.h */,
337-
AAE405C41F9607C000EDAF53 /* music_modplug.c */,
338-
AAE405C51F9607C000EDAF53 /* music_modplug.h */,
339333
AAE405DF1F9607C300EDAF53 /* music_mpg123.c */,
340334
AAE405D31F9607C100EDAF53 /* music_mpg123.h */,
341335
AAE405D51F9607C100EDAF53 /* music_nativemidi.c */,
@@ -468,7 +462,6 @@
468462
F307A5302B5473760012534B /* music_minimp3.h in Headers */,
469463
AAE405E71F9607C300EDAF53 /* load_voc.h in Headers */,
470464
AAE405EC1F9607C300EDAF53 /* music_wav.h in Headers */,
471-
AAE405E91F9607C300EDAF53 /* music_modplug.h in Headers */,
472465
AAE405FE1F9607C300EDAF53 /* music_nativemidi.h in Headers */,
473466
F37A8D4A2838A23400C38E95 /* music_drflac.h in Headers */,
474467
F30240632881DF95002F32D6 /* music_xmp.h in Headers */,
@@ -695,7 +688,6 @@
695688
AAE405ED1F9607C300EDAF53 /* music_wav.c in Sources */,
696689
F30240652881DF95002F32D6 /* music_xmp.c in Sources */,
697690
F307A52F2B5473760012534B /* music_minimp3.c in Sources */,
698-
AAE405E81F9607C300EDAF53 /* music_modplug.c in Sources */,
699691
AAE405E51F9607C300EDAF53 /* mixer.c in Sources */,
700692
0448E8AE108B937A00C9D3EA /* native_midi_macosx.c in Sources */,
701693
630FBD8320D52105009867AB /* music_opus.c in Sources */,

‎Xcode/pkg-support/resources/CMake/SDL3_mixerConfig.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ set(SDLMIXER_FLAC_DRFLAC TRUE)
3131
set(SDLMIXER_GME TRUE)
3232

3333
set(SDLMIXER_MOD FALSE)
34-
set(SDLMIXER_MOD_MODPLUG FALSE)
3534
set(SDLMIXER_MOD_XMP TRUE)
3635
set(SDLMIXER_MOD_XMP_LITE TRUE)
3736

‎Xcode/pkg-support/share/cmake/SDL3_mixer/SDL3_mixerConfig.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ set(SDLMIXER_FLAC_DRFLAC TRUE)
9292
set(SDLMIXER_GME TRUE)
9393

9494
set(SDLMIXER_MOD FALSE)
95-
set(SDLMIXER_MOD_MODPLUG FALSE)
9695
set(SDLMIXER_MOD_XMP TRUE)
9796
set(SDLMIXER_MOD_XMP_LITE TRUE)
9897

‎Xcode/xmp/xmp.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@
389389
dependencies = (
390390
);
391391
name = xmp;
392-
productName = libmodplug;
392+
productName = libxmp;
393393
productReference = F3968D85281FBB1900661875 /* xmp.framework */;
394394
productType = "com.apple.product-type.framework";
395395
};

‎build-scripts/android-prefab.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ build_cmake_projects() {
7373
-DWITH_ASM=OFF \
7474
-DSDLMIXER_FLAC_LIBFLAC=ON \
7575
-DSDLMIXER_MOD=ON \
76-
-DSDLMIXER_MOD_MODPLUG=OFF \
7776
-DSDLMIXER_MOD_XMP=ON \
7877
-DSDLMIXER_MP3=ON \
7978
-DSDLMIXER_MP3_MPG123=ON \

‎build-scripts/pkg-support/android/aar/cmake/SDL3_mixerConfig.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ set(SDLMIXER_FLAC_DRFLAC TRUE)
3838
set(SDLMIXER_GME FALSE)
3939

4040
set(SDLMIXER_MOD FALSE)
41-
set(SDLMIXER_MOD_MODPLUG FALSE)
4241
set(SDLMIXER_MOD_XMP FALSE)
4342
set(SDLMIXER_MOD_XMP_LITE FALSE)
4443

0 commit comments

Comments
 (0)