Skip to content

remove libmodplug support. #673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 10, 2025
Merged

remove libmodplug support. #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
793d8e6
remove libmodplug support.
sezero Mar 9, 2025
27f7850
remove obsolete enum values MUS_MODPLUG_UNUSED and MUS_MP3_MAD_UNUSED.
sezero Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 3 additions & 46 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,12 @@ option(SDLMIXER_GME_SHARED "Dynamically load libgme" "${SDLMIXER_DEPS_SHARED}")

option(SDLMIXER_MOD "Support loading MOD music" ON)

cmake_dependent_option(SDLMIXER_MOD_MODPLUG "Support loading MOD music via modplug" OFF SDLMIXER_MOD OFF)
cmake_dependent_option(SDLMIXER_MOD_MODPLUG_SHARED "Dynamically load modplug" "${SDLMIXER_DEPS_SHARED}" SDLMIXER_MOD_MODPLUG OFF)

cmake_dependent_option(SDLMIXER_MOD_XMP "Support loading MOD music via libxmp" ON SDLMIXER_MOD OFF)
cmake_dependent_option(SDLMIXER_MOD_XMP_LITE "Use libxmp-lite instead of libxmp" OFF "SDLMIXER_MOD_XMP;NOT SDLMIXER_VENDORED" OFF)
cmake_dependent_option(SDLMIXER_MOD_XMP_SHARED "Dynamically load libxmp(-lite)" "${SDLMIXER_DEPS_SHARED}" SDLMIXER_MOD_XMP OFF)

if(SDLMIXER_MOD AND NOT (SDLMIXER_MOD_MODPLUG OR SDLMIXER_MOD_XMP))
message(FATAL_ERROR "MOD support was enabled (SDLMIXER_MOD) but neither modplug (SDLMIXER_MOD_MODPLUG) or xmp (SDLMIXER_MOD_XMP) was enabled.")
if(SDLMIXER_MOD AND NOT SDLMIXER_MOD_XMP)
message(FATAL_ERROR "MOD support was enabled (SDLMIXER_MOD) but xmp (SDLMIXER_MOD_XMP) was enabled.")
endif()

option(SDLMIXER_MP3 "Enable MP3 music" ON)
Expand Down Expand Up @@ -258,7 +255,6 @@ add_library(${sdl3_mixer_target_name}
src/codecs/music_fluidsynth.c
src/codecs/music_gme.c
src/codecs/music_minimp3.c
src/codecs/music_modplug.c
src/codecs/music_mpg123.c
src/codecs/music_nativemidi.c
src/codecs/music_ogg.c
Expand Down Expand Up @@ -743,44 +739,6 @@ if(SDLMIXER_GME)
endif()
endif()

list(APPEND SDLMIXER_BACKENDS MOD_MODPLUG)
set(SDLMIXER_MOD_MODPLUG_ENABLED FALSE)
if(SDLMIXER_MOD_MODPLUG)
if(SDLMIXER_VENDORED)
message(STATUS "Using vendored libmodplug")
message(${fatal_error} "libmodplug is not vendored.")
else()
find_package(modplug ${required})
if(modplug_FOUND)
set(SDLMIXER_MOD_MODPLUG_ENABLED TRUE)
message(STATUS "Using system libmodplug")
if(NOT SDLMIXER_MOD_MODPLUG_SHARED)
list(APPEND PC_REQUIRES libmodplug)
endif()
else()
message(${fatal_error} "libmodplug NOT found")
endif()
endif()
if(SDLMIXER_MOD_MODPLUG_ENABLED)
target_compile_definitions(${sdl3_mixer_target_name} PRIVATE MUSIC_MOD_MODPLUG)
if(SDLMIXER_MOD_MODPLUG_SHARED)
target_include_directories(${sdl3_mixer_target_name} PRIVATE
$<TARGET_PROPERTY:modplug::modplug,INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:modplug::modplug,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:modplug::modplug,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
)
target_get_dynamic_library(dynamic_modplug modplug::modplug)
message(STATUS "Dynamic modplug: ${dynamic_modplug}")
target_compile_definitions(${sdl3_mixer_target_name} PRIVATE "MODPLUG_DYNAMIC=\"${dynamic_modplug}\"")
if(SDLMIXER_VENDORED)
add_dependencies(${sdl3_mixer_target_name} modplug::modplug)
endif()
else()
target_link_libraries(${sdl3_mixer_target_name} PRIVATE modplug::modplug)
endif()
endif()
endif()

list(APPEND SDLMIXER_BACKENDS MOD_XMP)
set(SDLMIXER_MOD_XMP_ENABLED FALSE)
if(SDLMIXER_MOD_XMP)
Expand Down Expand Up @@ -863,7 +821,7 @@ if(SDLMIXER_MOD_XMP)
endif()

set(SDLMIXER_MOD_ENABLED FALSE)
if(SDLMIXER_MOD_MODPLUG_ENABLED OR SDLMIXER_MOD_XMP_ENABLED OR SDLMIXER_MOD_XMP_ENABLED)
if(SDLMIXER_MOD_XMP_ENABLED)
set(SDLMIXER_MOD_ENABLED TRUE)
endif()

Expand Down Expand Up @@ -1164,7 +1122,6 @@ if(SDLMIXER_INSTALL)
cmake/Findgme.cmake
cmake/Findlibxmp.cmake
cmake/Findlibxmp-lite.cmake
cmake/Findmodplug.cmake
cmake/FindOgg.cmake
cmake/FindOpus.cmake
cmake/FindOpusFile.cmake
Expand Down
2 changes: 0 additions & 2 deletions VisualC/SDL_mixer.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@
<ClInclude Include="..\src\codecs\music_fluidsynth.h" />
<ClInclude Include="..\src\codecs\music_gme.h" />
<ClInclude Include="..\src\codecs\music_minimp3.h" />
<ClInclude Include="..\src\codecs\music_modplug.h" />
<ClInclude Include="..\src\codecs\music_mpg123.h" />
<ClInclude Include="..\src\codecs\music_nativemidi.h" />
<ClInclude Include="..\src\codecs\music_ogg.h" />
Expand Down Expand Up @@ -450,7 +449,6 @@
<ClCompile Include="..\src\codecs\music_fluidsynth.c" />
<ClCompile Include="..\src\codecs\music_gme.c" />
<ClCompile Include="..\src\codecs\music_minimp3.c" />
<ClCompile Include="..\src\codecs\music_modplug.c" />
<ClCompile Include="..\src\codecs\music_mpg123.c" />
<ClCompile Include="..\src\codecs\music_nativemidi.c" />
<ClCompile Include="..\src\codecs\music_ogg.c" />
Expand Down
6 changes: 0 additions & 6 deletions VisualC/SDL_mixer.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@
<ClInclude Include="..\src\codecs\music_minimp3.h">
<Filter>Sources</Filter>
</ClInclude>
<ClInclude Include="..\src\codecs\music_modplug.h">
<Filter>Sources</Filter>
</ClInclude>
<ClInclude Include="..\src\codecs\music_mpg123.h">
<Filter>Sources</Filter>
</ClInclude>
Expand Down Expand Up @@ -179,9 +176,6 @@
<ClCompile Include="..\src\codecs\music_minimp3.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\codecs\music_modplug.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\codecs\music_mpg123.c">
<Filter>Sources</Filter>
</ClCompile>
Expand Down
173 changes: 0 additions & 173 deletions VisualC/external/include/libmodplug/modplug.h
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Xcode/SDL_mixer.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@
AAE405E51F9607C300EDAF53 /* mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405C11F9607C000EDAF53 /* mixer.c */; };
AAE405E61F9607C300EDAF53 /* music.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405C21F9607C000EDAF53 /* music.h */; };
AAE405E71F9607C300EDAF53 /* load_voc.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405C31F9607C000EDAF53 /* load_voc.h */; };
AAE405E81F9607C300EDAF53 /* music_modplug.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405C41F9607C000EDAF53 /* music_modplug.c */; };
AAE405E91F9607C300EDAF53 /* music_modplug.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405C51F9607C000EDAF53 /* music_modplug.h */; };
AAE405EA1F9607C300EDAF53 /* music_fluidsynth.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405C61F9607C000EDAF53 /* music_fluidsynth.c */; };
AAE405EB1F9607C300EDAF53 /* music_flac.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405C71F9607C000EDAF53 /* music_flac.h */; };
AAE405EC1F9607C300EDAF53 /* music_wav.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405C81F9607C000EDAF53 /* music_wav.h */; };
Expand Down Expand Up @@ -190,8 +188,6 @@
AAE405C11F9607C000EDAF53 /* mixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mixer.c; sourceTree = "<group>"; };
AAE405C21F9607C000EDAF53 /* music.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music.h; sourceTree = "<group>"; };
AAE405C31F9607C000EDAF53 /* load_voc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = load_voc.h; sourceTree = "<group>"; };
AAE405C41F9607C000EDAF53 /* music_modplug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = music_modplug.c; sourceTree = "<group>"; };
AAE405C51F9607C000EDAF53 /* music_modplug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music_modplug.h; sourceTree = "<group>"; };
AAE405C61F9607C000EDAF53 /* music_fluidsynth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = music_fluidsynth.c; sourceTree = "<group>"; };
AAE405C71F9607C000EDAF53 /* music_flac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music_flac.h; sourceTree = "<group>"; };
AAE405C81F9607C000EDAF53 /* music_wav.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music_wav.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -334,8 +330,6 @@
F3F8794A29B30FDA0007FDA1 /* music_gme.h */,
F307A52D2B5473760012534B /* music_minimp3.c */,
F307A52E2B5473760012534B /* music_minimp3.h */,
AAE405C41F9607C000EDAF53 /* music_modplug.c */,
AAE405C51F9607C000EDAF53 /* music_modplug.h */,
AAE405DF1F9607C300EDAF53 /* music_mpg123.c */,
AAE405D31F9607C100EDAF53 /* music_mpg123.h */,
AAE405D51F9607C100EDAF53 /* music_nativemidi.c */,
Expand Down Expand Up @@ -468,7 +462,6 @@
F307A5302B5473760012534B /* music_minimp3.h in Headers */,
AAE405E71F9607C300EDAF53 /* load_voc.h in Headers */,
AAE405EC1F9607C300EDAF53 /* music_wav.h in Headers */,
AAE405E91F9607C300EDAF53 /* music_modplug.h in Headers */,
AAE405FE1F9607C300EDAF53 /* music_nativemidi.h in Headers */,
F37A8D4A2838A23400C38E95 /* music_drflac.h in Headers */,
F30240632881DF95002F32D6 /* music_xmp.h in Headers */,
Expand Down Expand Up @@ -695,7 +688,6 @@
AAE405ED1F9607C300EDAF53 /* music_wav.c in Sources */,
F30240652881DF95002F32D6 /* music_xmp.c in Sources */,
F307A52F2B5473760012534B /* music_minimp3.c in Sources */,
AAE405E81F9607C300EDAF53 /* music_modplug.c in Sources */,
AAE405E51F9607C300EDAF53 /* mixer.c in Sources */,
0448E8AE108B937A00C9D3EA /* native_midi_macosx.c in Sources */,
630FBD8320D52105009867AB /* music_opus.c in Sources */,
Expand Down
1 change: 0 additions & 1 deletion Xcode/pkg-support/resources/CMake/SDL3_mixerConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ set(SDLMIXER_FLAC_DRFLAC TRUE)
set(SDLMIXER_GME TRUE)

set(SDLMIXER_MOD FALSE)
set(SDLMIXER_MOD_MODPLUG FALSE)
set(SDLMIXER_MOD_XMP TRUE)
set(SDLMIXER_MOD_XMP_LITE TRUE)

Expand Down
1 change: 0 additions & 1 deletion Xcode/pkg-support/share/cmake/SDL3_mixer/SDL3_mixerConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ set(SDLMIXER_FLAC_DRFLAC TRUE)
set(SDLMIXER_GME TRUE)

set(SDLMIXER_MOD FALSE)
set(SDLMIXER_MOD_MODPLUG FALSE)
set(SDLMIXER_MOD_XMP TRUE)
set(SDLMIXER_MOD_XMP_LITE TRUE)

Expand Down
2 changes: 1 addition & 1 deletion Xcode/xmp/xmp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@
dependencies = (
);
name = xmp;
productName = libmodplug;
productName = libxmp;
productReference = F3968D85281FBB1900661875 /* xmp.framework */;
productType = "com.apple.product-type.framework";
};
Expand Down
1 change: 0 additions & 1 deletion build-scripts/android-prefab.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ build_cmake_projects() {
-DWITH_ASM=OFF \
-DSDLMIXER_FLAC_LIBFLAC=ON \
-DSDLMIXER_MOD=ON \
-DSDLMIXER_MOD_MODPLUG=OFF \
-DSDLMIXER_MOD_XMP=ON \
-DSDLMIXER_MP3=ON \
-DSDLMIXER_MP3_MPG123=ON \
Expand Down
1 change: 0 additions & 1 deletion build-scripts/pkg-support/android/aar/cmake/SDL3_mixerConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ set(SDLMIXER_FLAC_DRFLAC TRUE)
set(SDLMIXER_GME FALSE)

set(SDLMIXER_MOD FALSE)
set(SDLMIXER_MOD_MODPLUG FALSE)
set(SDLMIXER_MOD_XMP FALSE)
set(SDLMIXER_MOD_XMP_LITE FALSE)

Expand Down
Loading
Loading