Skip to content

Commit

Permalink
Use libmpg123 by default instead of libmad (from Ironwail)
Browse files Browse the repository at this point in the history
  • Loading branch information
@vsonnier
vsonnier committed Oct 25, 2024
1 parent 72026f9 commit 8b42de7
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Packaging/AppImage/docker/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apt-get update \
libaudiofile-dev \
libdbus-1-dev \
libibus-1.0-dev \
libmad0-dev \
libmpg123-dev \
libopenal-dev \
libpulse-dev \
libsndio-dev \
Expand Down
2 changes: 1 addition & 1 deletion Quake/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ USE_CODEC_MODPLUG = 0
USE_CODEC_UMX = 0

# which library to use for mp3 decoding: mad or mpg123
MP3LIB = mad
MP3LIB = mpg123
# which library to use for ogg decoding: vorbis or tremor
VORBISLIB = vorbis

Expand Down
2 changes: 1 addition & 1 deletion Quake/Makefile.w32
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ USE_CODEC_MODPLUG = 0
USE_CODEC_UMX = 1

# which library to use for mp3 decoding: mad or mpg123
MP3LIB = mad
MP3LIB = mpg123
# which library to use for ogg decoding: vorbis or tremor
VORBISLIB = vorbis

Expand Down
2 changes: 1 addition & 1 deletion Quake/Makefile.w64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ USE_CODEC_MODPLUG = 0
USE_CODEC_UMX = 1

# which library to use for mp3 decoding: mad or mpg123
MP3LIB = mad
MP3LIB = mpg123
# which library to use for ogg decoding: vorbis or tremor
VORBISLIB = vorbis

Expand Down
12 changes: 6 additions & 6 deletions Windows/VisualStudio/vkquake.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
<PrecompiledHeaderFile>quakedef.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
<AdditionalDependencies>libvorbisfile.lib;libvorbis.lib;libopusfile.lib;libopus.lib;libFLAC.lib;libogg.lib;libmad.lib;libxmp.lib;ws2_32.lib;winmm.lib;SDL2.lib;SDL2main.lib;vulkan-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libvorbisfile.lib;libvorbis.lib;libopusfile.lib;libopus.lib;libFLAC.lib;libogg.lib;libmpg123.lib;libxmp.lib;ws2_32.lib;winmm.lib;SDL2.lib;SDL2main.lib;vulkan-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\codecs\x86;..\SDL2\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand Down Expand Up @@ -149,7 +149,7 @@ copy "$(SolutionDir)\..\SDL2\lib\*.dll" "$(TargetDir)"</Command>
<PrecompiledHeaderFile>quakedef.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
<AdditionalDependencies>libvorbisfile.lib;libvorbis.lib;libopusfile.lib;libopus.lib;libFLAC.lib;libogg.lib;libmad.lib;libxmp.lib;ws2_32.lib;winmm.lib;SDL2.lib;SDL2main.lib;vulkan-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libvorbisfile.lib;libvorbis.lib;libopusfile.lib;libopus.lib;libFLAC.lib;libogg.lib;libmpg123.lib;libxmp.lib;ws2_32.lib;winmm.lib;SDL2.lib;SDL2main.lib;vulkan-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\codecs\x86;..\SDL2\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Expand Down Expand Up @@ -185,7 +185,7 @@ copy "$(SolutionDir)\..\SDL2\lib\*.dll" "$(TargetDir)"</Command>
<PrecompiledHeaderFile>quakedef.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
<AdditionalDependencies>libvorbisfile.lib;libvorbis.lib;libopusfile.lib;libopus.lib;libFLAC.lib;libogg.lib;libmad.lib;libxmp.lib;ws2_32.lib;winmm.lib;SDL2.lib;SDL2main.lib;vulkan-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libvorbisfile.lib;libvorbis.lib;libopusfile.lib;libopus.lib;libFLAC.lib;libogg.lib;libmpg123.lib;libxmp.lib;ws2_32.lib;winmm.lib;SDL2.lib;SDL2main.lib;vulkan-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\codecs\x64;..\SDL2\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand Down Expand Up @@ -222,7 +222,7 @@ copy "$(SolutionDir)\..\SDL2\lib64\*.dll" "$(TargetDir)"</Command>
<PrecompiledHeaderFile>quakedef.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
<AdditionalDependencies>libvorbisfile.lib;libvorbis.lib;libopusfile.lib;libopus.lib;libFLAC.lib;libogg.lib;libmad.lib;libxmp.lib;ws2_32.lib;winmm.lib;SDL2.lib;SDL2main.lib;vulkan-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libvorbisfile.lib;libvorbis.lib;libopusfile.lib;libopus.lib;libFLAC.lib;libogg.lib;libmpg123.lib;libxmp.lib;ws2_32.lib;winmm.lib;SDL2.lib;SDL2main.lib;vulkan-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\codecs\x64;..\SDL2\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Expand Down Expand Up @@ -335,14 +335,14 @@ copy "$(SolutionDir)\..\SDL2\lib64\*.dll" "$(TargetDir)"</Command>
<ClCompile Include="..\..\Quake\snd_mikmod.c" />
<ClCompile Include="..\..\Quake\snd_mix.c" />
<ClCompile Include="..\..\Quake\snd_modplug.c" />
<ClCompile Include="..\..\Quake\snd_mp3.c" />
<ClCompile Include="..\..\Quake\snd_mp3tag.c" />
<ClCompile Include="..\..\Quake\snd_mpg123.c">
<ClCompile Include="..\..\Quake\snd_mp3.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\Quake\snd_mpg123.c" />
<ClCompile Include="..\..\Quake\snd_opus.c" />
<ClCompile Include="..\..\Quake\snd_sdl.c" />
<ClCompile Include="..\..\Quake\snd_umx.c" />
Expand Down

3 comments on commit 8b42de7

@sezero
Copy link
Collaborator

@sezero sezero commented on 8b42de7 Oct 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you should update meson_options.txt , too

@j4reporting
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the readme.md file lists libmad as build dependency for linux and macos

@Novum
Copy link
Owner

@Novum Novum commented on 8b42de7 Jan 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this change made btw?

Please sign in to comment.