Skip to content

Commit 9b1a835

Browse files
sezerosezero
committed
removed minimp3 as a mp3 backend.
1 parent 354a36d commit 9b1a835

File tree

20 files changed

+19
-4060
lines changed

20 files changed

+19
-4060
lines changed

‎Android.mk

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@ SUPPORT_OGG ?= false
1919
OGG_LIBRARY_PATH := external/ogg
2020
VORBIS_LIBRARY_PATH := external/tremor
2121

22-
# Enable this if you want to support loading MP3 music via MINIMP3
23-
SUPPORT_MP3_MINIMP3 ?= true
2422
# Enable this if you want to support loading MP3 music via dr_mp3
25-
SUPPORT_MP3_DRMP3 ?= false
23+
SUPPORT_MP3_DRMP3 ?= true
2624

2725
# Enable this if you want to support loading MP3 music via MPG123
2826
SUPPORT_MP3_MPG123 ?= false
@@ -131,9 +129,6 @@ ifeq ($(SUPPORT_OGG),true)
131129
LOCAL_STATIC_LIBRARIES += ogg vorbisidec
132130
endif
133131

134-
ifeq ($(SUPPORT_MP3_MINIMP3),true)
135-
LOCAL_CFLAGS += -DMUSIC_MP3_MINIMP3
136-
endif
137132
ifeq ($(SUPPORT_MP3_DRMP3),true)
138133
LOCAL_CFLAGS += -DMUSIC_MP3_DRMP3
139134
endif
@@ -185,4 +180,3 @@ LOCAL_LDLIBS :=
185180
LOCAL_EXPORT_LDLIBS :=
186181

187182
include $(BUILD_STATIC_LIBRARY)
188-

‎CMakeLists.txt

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,13 @@ endif()
148148

149149
option(SDLMIXER_MP3 "Enable MP3 music" ON)
150150

151-
cmake_dependent_option(SDLMIXER_MP3_MINIMP3 "Support loading MP3 music via minimp3" ON SDLMIXER_MP3 OFF)
152-
cmake_dependent_option(SDLMIXER_MP3_DRMP3 "Support loading MP3 music via dr_mp3" OFF SDLMIXER_MP3 OFF)
151+
cmake_dependent_option(SDLMIXER_MP3_DRMP3 "Support loading MP3 music via dr_mp3" ON SDLMIXER_MP3 OFF)
153152

154153
cmake_dependent_option(SDLMIXER_MP3_MPG123 "Support loading MP3 music via MPG123" OFF SDLMIXER_MP3 OFF)
155154
cmake_dependent_option(SDLMIXER_MP3_MPG123_SHARED "Dynamically load mpg123" "${SDLMIXER_DEPS_SHARED}" SDLMIXER_MP3_MPG123 OFF)
156155

157-
if(SDLMIXER_MP3 AND NOT (SDLMIXER_MP3_MINIMP3 OR SDLMIXER_MP3_DRMP3 OR SDLMIXER_MP3_MPG123))
158-
message(FATAL_ERROR "MP3 support was enabled (SDLMIXER_MP3) but neither drmp3 (SDLMIXER_MP3_DRMP3), minimp3 (SDLMIXER_MP3_MINIMP3) or mpg123 (SDLMIXER_MP3_MPG123) were enabled.")
156+
if(SDLMIXER_MP3 AND NOT (SDLMIXER_MP3_DRMP3 OR SDLMIXER_MP3_MPG123))
157+
message(FATAL_ERROR "MP3 support was enabled (SDLMIXER_MP3) but neither drmp3 (SDLMIXER_MP3_DRMP3) or mpg123 (SDLMIXER_MP3_MPG123) were enabled.")
159158
endif()
160159

161160
option(SDLMIXER_MIDI "Enable MIDI music" ON)
@@ -256,7 +255,6 @@ add_library(${sdl3_mixer_target_name}
256255
src/codecs/music_flac.c
257256
src/codecs/music_fluidsynth.c
258257
src/codecs/music_gme.c
259-
src/codecs/music_minimp3.c
260258
src/codecs/music_mpg123.c
261259
src/codecs/music_nativemidi.c
262260
src/codecs/music_ogg.c
@@ -827,13 +825,6 @@ if(SDLMIXER_MOD_XMP_ENABLED)
827825
set(SDLMIXER_MOD_ENABLED TRUE)
828826
endif()
829827

830-
list(APPEND SDLMIXER_BACKENDS MP3_MINIMP3)
831-
set(SDLMIXER_MP3_MINIMP3_ENABLED FALSE)
832-
if(SDLMIXER_MP3_MINIMP3)
833-
set(SDLMIXER_MP3_MINIMP3_ENABLED TRUE)
834-
target_compile_definitions(${sdl3_mixer_target_name} PRIVATE MUSIC_MP3_MINIMP3)
835-
endif()
836-
837828
list(APPEND SDLMIXER_BACKENDS MP3_DRMP3)
838829
set(SDLMIXER_MP3_DRMP3_ENABLED FALSE)
839830
if(SDLMIXER_MP3_DRMP3)
@@ -894,7 +885,7 @@ if(SDLMIXER_MP3_MPG123)
894885
endif()
895886

896887
set(SDLMIXER_MP3_ENABLED FALSE)
897-
if(SDLMIXER_MP3_MINIMP3_ENABLED OR SDLMIXER_MP3_MPG123_ENABLED)
888+
if(SDLMIXER_MP3_DRMP3_ENABLED OR SDLMIXER_MP3_MPG123_ENABLED)
898889
set(SDLMIXER_MP3_ENABLED TRUE)
899890
endif()
900891

‎README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ Support for software MIDI, MOD, and Opus are not included by default because of
2828
- When building with Xcode, you can edit the config at the top of the project to enable them, and you will need to include the appropriate framework in your application.
2929
- For Android, you can edit the config at the top of Android.mk to enable them.
3030

31-
The default MP3 support is provided using minimp3. SDL_mixer also supports using libmpg123: you can enable it by passing --enable-music-mp3-mpg123 to configure.
31+
The default MP3 support is provided using drmp3. SDL_mixer also supports using libmpg123: you can enable it by passing --enable-music-mp3-mpg123 to configure.

‎VisualC/SDL_mixer.vcxproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<ClCompile>
117117
<Optimization>Disabled</Optimization>
118118
<AdditionalIncludeDirectories>$(ProjectDir)..\include;$(ProjectDir)..\src;$(ProjectDir)..\src\codecs;$(ProjectDir)..\src\codecs\timidity;$(ProjectDir)..\src\codecs\native_midi;$(ProjectDir)external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
119-
<PreprocessorDefinitions>DLL_EXPORT;_DEBUG;WIN32;_WINDOWS;MUSIC_WAV;MUSIC_WAVPACK;MUSIC_FLAC_DRFLAC;MUSIC_MOD_XMP;XMP_DYNAMIC="libxmp.dll";MUSIC_MP3_MINIMP3;MUSIC_OGG;OGG_USE_STB;OGG_DYNAMIC="libvorbisfile-3.dll";MUSIC_OPUS;OPUS_DYNAMIC="libopusfile-0.dll";WAVPACK_DYNAMIC="libwavpack-1.dll";MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;MUSIC_GME;GME_DYNAMIC="libgme.dll";%(PreprocessorDefinitions)</PreprocessorDefinitions>
119+
<PreprocessorDefinitions>DLL_EXPORT;_DEBUG;WIN32;_WINDOWS;MUSIC_WAV;MUSIC_WAVPACK;MUSIC_FLAC_DRFLAC;MUSIC_MOD_XMP;XMP_DYNAMIC="libxmp.dll";MUSIC_MP3_DRMP3;MUSIC_OGG;OGG_USE_STB;OGG_DYNAMIC="libvorbisfile-3.dll";MUSIC_OPUS;OPUS_DYNAMIC="libopusfile-0.dll";WAVPACK_DYNAMIC="libwavpack-1.dll";MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;MUSIC_GME;GME_DYNAMIC="libgme.dll";%(PreprocessorDefinitions)</PreprocessorDefinitions>
120120
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
121121
<WarningLevel>Level3</WarningLevel>
122122
<DebugInformationFormat>OldStyle</DebugInformationFormat>
@@ -144,7 +144,7 @@
144144
<ClCompile>
145145
<Optimization>Disabled</Optimization>
146146
<AdditionalIncludeDirectories>$(ProjectDir)..\include;$(ProjectDir)..\src;$(ProjectDir)..\src\codecs;$(ProjectDir)..\src\codecs\timidity;$(ProjectDir)..\src\codecs\native_midi;$(ProjectDir)external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
147-
<PreprocessorDefinitions>DLL_EXPORT;_DEBUG;WIN32;_WINDOWS;MUSIC_WAV;MUSIC_WAVPACK;MUSIC_FLAC_DRFLAC;MUSIC_MOD_XMP;XMP_DYNAMIC="libxmp.dll";MUSIC_MP3_MINIMP3;MUSIC_OGG;OGG_USE_STB;OGG_DYNAMIC="libvorbisfile-3.dll";MUSIC_OPUS;OPUS_DYNAMIC="libopusfile-0.dll";WAVPACK_DYNAMIC="libwavpack-1.dll";MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;MUSIC_GME;GME_DYNAMIC="libgme.dll";%(PreprocessorDefinitions)</PreprocessorDefinitions>
147+
<PreprocessorDefinitions>DLL_EXPORT;_DEBUG;WIN32;_WINDOWS;MUSIC_WAV;MUSIC_WAVPACK;MUSIC_FLAC_DRFLAC;MUSIC_MOD_XMP;XMP_DYNAMIC="libxmp.dll";MUSIC_MP3_DRMP3;MUSIC_OGG;OGG_USE_STB;OGG_DYNAMIC="libvorbisfile-3.dll";MUSIC_OPUS;OPUS_DYNAMIC="libopusfile-0.dll";WAVPACK_DYNAMIC="libwavpack-1.dll";MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;MUSIC_GME;GME_DYNAMIC="libgme.dll";%(PreprocessorDefinitions)</PreprocessorDefinitions>
148148
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
149149
<WarningLevel>Level3</WarningLevel>
150150
<DebugInformationFormat>OldStyle</DebugInformationFormat>
@@ -170,7 +170,7 @@
170170
</Midl>
171171
<ClCompile>
172172
<AdditionalIncludeDirectories>$(ProjectDir)..\include;$(ProjectDir)..\src;$(ProjectDir)..\src\codecs;$(ProjectDir)..\src\codecs\timidity;$(ProjectDir)..\src\codecs\native_midi;$(ProjectDir)external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
173-
<PreprocessorDefinitions>DLL_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;MUSIC_WAVPACK;MUSIC_WAV;MUSIC_FLAC_DRFLAC;MUSIC_MOD_XMP;XMP_DYNAMIC="libxmp.dll";MUSIC_MP3_MINIMP3;MUSIC_OGG;OGG_USE_STB;OGG_DYNAMIC="libvorbisfile-3.dll";MUSIC_OPUS;OPUS_DYNAMIC="libopusfile-0.dll";WAVPACK_DYNAMIC="libwavpack-1.dll";MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;MUSIC_GME;GME_DYNAMIC="libgme.dll";%(PreprocessorDefinitions)</PreprocessorDefinitions>
173+
<PreprocessorDefinitions>DLL_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;MUSIC_WAVPACK;MUSIC_WAV;MUSIC_FLAC_DRFLAC;MUSIC_MOD_XMP;XMP_DYNAMIC="libxmp.dll";MUSIC_MP3_DRMP3;MUSIC_OGG;OGG_USE_STB;OGG_DYNAMIC="libvorbisfile-3.dll";MUSIC_OPUS;OPUS_DYNAMIC="libopusfile-0.dll";WAVPACK_DYNAMIC="libwavpack-1.dll";MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;MUSIC_GME;GME_DYNAMIC="libgme.dll";%(PreprocessorDefinitions)</PreprocessorDefinitions>
174174
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
175175
<WarningLevel>Level3</WarningLevel>
176176
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
@@ -197,7 +197,7 @@
197197
</Midl>
198198
<ClCompile>
199199
<AdditionalIncludeDirectories>$(ProjectDir)..\include;$(ProjectDir)..\src;$(ProjectDir)..\src\codecs;$(ProjectDir)..\src\codecs\timidity;$(ProjectDir)..\src\codecs\native_midi;$(ProjectDir)external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
200-
<PreprocessorDefinitions>DLL_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;MUSIC_WAVPACK;MUSIC_WAV;MUSIC_FLAC_DRFLAC;MUSIC_MOD_XMP;XMP_DYNAMIC="libxmp.dll";MUSIC_MP3_MINIMP3;MUSIC_OGG;OGG_USE_STB;OGG_DYNAMIC="libvorbisfile-3.dll";MUSIC_OPUS;OPUS_DYNAMIC="libopusfile-0.dll";WAVPACK_DYNAMIC="libwavpack-1.dll";MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;MUSIC_GME;GME_DYNAMIC="libgme.dll";%(PreprocessorDefinitions)</PreprocessorDefinitions>
200+
<PreprocessorDefinitions>DLL_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;MUSIC_WAVPACK;MUSIC_WAV;MUSIC_FLAC_DRFLAC;MUSIC_MOD_XMP;XMP_DYNAMIC="libxmp.dll";MUSIC_MP3_DRMP3;MUSIC_OGG;OGG_USE_STB;OGG_DYNAMIC="libvorbisfile-3.dll";MUSIC_OPUS;OPUS_DYNAMIC="libopusfile-0.dll";WAVPACK_DYNAMIC="libwavpack-1.dll";MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;MUSIC_GME;GME_DYNAMIC="libgme.dll";%(PreprocessorDefinitions)</PreprocessorDefinitions>
201201
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
202202
<WarningLevel>Level3</WarningLevel>
203203
</ClCompile>
@@ -226,7 +226,6 @@
226226
<ClInclude Include="..\src\codecs\music_flac.h" />
227227
<ClInclude Include="..\src\codecs\music_fluidsynth.h" />
228228
<ClInclude Include="..\src\codecs\music_gme.h" />
229-
<ClInclude Include="..\src\codecs\music_minimp3.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_flac.c" />
451450
<ClCompile Include="..\src\codecs\music_fluidsynth.c" />
452451
<ClCompile Include="..\src\codecs\music_gme.c" />
453-
<ClCompile Include="..\src\codecs\music_minimp3.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_gme.h">
4444
<Filter>Sources</Filter>
4545
</ClInclude>
46-
<ClInclude Include="..\src\codecs\music_minimp3.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_gme.c">
180177
<Filter>Sources</Filter>
181178
</ClCompile>
182-
<ClCompile Include="..\src\codecs\music_minimp3.c">
183-
<Filter>Sources</Filter>
184-
</ClCompile>
185179
<ClCompile Include="..\src\codecs\music_mpg123.c">
186180
<Filter>Sources</Filter>
187181
</ClCompile>

‎Xcode/SDL_mixer.xcodeproj/project.pbxproj

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@
7474
BE1FA8CD07AF96B2004B6283 /* SDL_mixer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1014BAEA010A4B677F000001 /* SDL_mixer.h */; settings = {ATTRIBUTES = (Public, ); }; };
7575
F30240632881DF95002F32D6 /* music_xmp.h in Headers */ = {isa = PBXBuildFile; fileRef = F302405F2881DF94002F32D6 /* music_xmp.h */; };
7676
F30240652881DF95002F32D6 /* music_xmp.c in Sources */ = {isa = PBXBuildFile; fileRef = F30240622881DF95002F32D6 /* music_xmp.c */; };
77-
F307A52F2B5473760012534B /* music_minimp3.c in Sources */ = {isa = PBXBuildFile; fileRef = F307A52D2B5473760012534B /* music_minimp3.c */; };
78-
F307A5302B5473760012534B /* music_minimp3.h in Headers */ = {isa = PBXBuildFile; fileRef = F307A52E2B5473760012534B /* music_minimp3.h */; };
7977
F3249B39285C448100DB9B5C /* CMake in Resources */ = {isa = PBXBuildFile; fileRef = F3249B36285C448100DB9B5C /* CMake */; };
8078
F3412A412D4C950E00D6C2B7 /* SDL3.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3412A402D4C950E00D6C2B7 /* SDL3.framework */; };
8179
F37A8D2D2838924900C38E95 /* music_drmp3.h in Headers */ = {isa = PBXBuildFile; fileRef = F37A8D2B2838924900C38E95 /* music_drmp3.h */; };
@@ -216,8 +214,6 @@
216214
F30240622881DF95002F32D6 /* music_xmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = music_xmp.c; sourceTree = "<group>"; };
217215
F307A25D2B542F110012534B /* wavpack.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = wavpack.xcodeproj; path = wavpack/wavpack.xcodeproj; sourceTree = "<group>"; };
218216
F307A2732B5431700012534B /* gme.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = gme.xcodeproj; path = gme/gme.xcodeproj; sourceTree = "<group>"; };
219-
F307A52D2B5473760012534B /* music_minimp3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = music_minimp3.c; sourceTree = "<group>"; };
220-
F307A52E2B5473760012534B /* music_minimp3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music_minimp3.h; sourceTree = "<group>"; };
221217
F3249B36285C448100DB9B5C /* CMake */ = {isa = PBXFileReference; lastKnownFileType = folder; path = CMake; sourceTree = "<group>"; };
222218
F3412A402D4C950E00D6C2B7 /* SDL3.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL3.framework; path = macOS/SDL3.framework; sourceTree = "<group>"; };
223219
F37A8D2B2838924900C38E95 /* music_drmp3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music_drmp3.h; sourceTree = "<group>"; };
@@ -334,8 +330,6 @@
334330
AAE405BF1F9607BF00EDAF53 /* music_fluidsynth.h */,
335331
F3F8794C29B30FDA0007FDA1 /* music_gme.c */,
336332
F3F8794A29B30FDA0007FDA1 /* music_gme.h */,
337-
F307A52D2B5473760012534B /* music_minimp3.c */,
338-
F307A52E2B5473760012534B /* music_minimp3.h */,
339333
AAE405DF1F9607C300EDAF53 /* music_mpg123.c */,
340334
AAE405D31F9607C100EDAF53 /* music_mpg123.h */,
341335
AAE405D51F9607C100EDAF53 /* music_nativemidi.c */,
@@ -466,7 +460,6 @@
466460
AAE405E31F9607C300EDAF53 /* music_fluidsynth.h in Headers */,
467461
AAE405F61F9607C300EDAF53 /* load_aiff.h in Headers */,
468462
F37A8D2D2838924900C38E95 /* music_drmp3.h in Headers */,
469-
F307A5302B5473760012534B /* music_minimp3.h in Headers */,
470463
AAE405E71F9607C300EDAF53 /* load_voc.h in Headers */,
471464
AAE405EC1F9607C300EDAF53 /* music_wav.h in Headers */,
472465
AAE405FE1F9607C300EDAF53 /* music_nativemidi.h in Headers */,
@@ -695,7 +688,6 @@
695688
AAE406041F9607C300EDAF53 /* effect_stereoreverse.c in Sources */,
696689
AAE405ED1F9607C300EDAF53 /* music_wav.c in Sources */,
697690
F30240652881DF95002F32D6 /* music_xmp.c in Sources */,
698-
F307A52F2B5473760012534B /* music_minimp3.c in Sources */,
699691
AAE405E51F9607C300EDAF53 /* mixer.c in Sources */,
700692
0448E8AE108B937A00C9D3EA /* native_midi_macosx.c in Sources */,
701693
630FBD8320D52105009867AB /* music_opus.c in Sources */,
@@ -780,7 +772,7 @@
780772
GCC_NO_COMMON_BLOCKS = YES;
781773
GCC_PREPROCESSOR_DEFINITIONS = (
782774
MUSIC_FLAC_DRFLAC,
783-
MUSIC_MP3_MINIMP3,
775+
MUSIC_MP3_DRMP3,
784776
MUSIC_OGG,
785777
OGG_USE_STB,
786778
MUSIC_WAV,
@@ -830,7 +822,7 @@
830822
GCC_OPTIMIZATION_LEVEL = 0;
831823
GCC_PREPROCESSOR_DEFINITIONS = (
832824
MUSIC_FLAC_DRFLAC,
833-
MUSIC_MP3_MINIMP3,
825+
MUSIC_MP3_DRMP3,
834826
MUSIC_OGG,
835827
OGG_USE_STB,
836828
MUSIC_WAV,

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ set(SDLMIXER_MOD_XMP TRUE)
3535
set(SDLMIXER_MOD_XMP_LITE TRUE)
3636

3737
set(SDLMIXER_MP3 TRUE)
38-
set(SDLMIXER_MP3_MINIMP3 TRUE)
39-
set(SDLMIXER_MP3_DRMP3 FALSE)
38+
set(SDLMIXER_MP3_DRMP3 TRUE)
4039
set(SDLMIXER_MP3_MPG123 FALSE)
4140

4241
set(SDLMIXER_MIDI TRUE)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ set(SDLMIXER_MOD_XMP TRUE)
9696
set(SDLMIXER_MOD_XMP_LITE TRUE)
9797

9898
set(SDLMIXER_MP3 TRUE)
99-
set(SDLMIXER_MP3_MINIMP3 TRUE)
99+
set(SDLMIXER_MP3_DRMP3 TRUE)
100100
set(SDLMIXER_MP3_MPG123 FALSE)
101101

102102
set(SDLMIXER_MIDI TRUE)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ set(SDLMIXER_MOD_XMP FALSE)
4242
set(SDLMIXER_MOD_XMP_LITE FALSE)
4343

4444
set(SDLMIXER_MP3 TRUE)
45-
set(SDLMIXER_MP3_MINIMP3 TRUE)
45+
set(SDLMIXER_MP3_DRMP3 TRUE)
4646
set(SDLMIXER_MP3_MPG123 FALSE)
4747

4848
set(SDLMIXER_MIDI FALSE)

‎build-scripts/pkg-support/msvc/cmake/SDL3_mixerConfig.cmake.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ set(SDLMIXER_MOD_XMP FALSE)
3434
set(SDLMIXER_MOD_XMP_LITE FALSE)
3535

3636
set(SDLMIXER_MP3 TRUE)
37-
set(SDLMIXER_MP3_MINIMP3 TRUE)
38-
set(SDLMIXER_MP3_DRMP3 FALSE)
37+
set(SDLMIXER_MP3_DRMP3 TRUE)
3938
set(SDLMIXER_MP3_MPG123 FALSE)
4039

4140
set(SDLMIXER_MIDI TRUE)

0 commit comments

Comments
 (0)