Merge branch 'master' of https://github.com/sezero/quakespasm

# Conflicts: # MacOSX/codecs/lib/libmpg123.dylib
andrei-drexler · Oct 27, 2024 · 723c5c8 · 723c5c8
2 parents ebda77f + afbad92
commit 723c5c8
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 3 deletions.
diff --git a/Quake/Makefile.w32 b/Quake/Makefile.w32
@@ -123,7 +123,6 @@ endif
 ifeq ($(MP3LIB),mpg123)
 mp3_obj=snd_mpg123
 lib_mp3dec=-lmpg123
-CFLAGS += -DMPG123_NO_LARGENAME=1
 endif
 ifeq ($(VORBISLIB),vorbis)
 cpp_vorbisdec=

diff --git a/Quake/Makefile.w64 b/Quake/Makefile.w64
@@ -116,7 +116,6 @@ endif
 ifeq ($(MP3LIB),mpg123)
 mp3_obj=snd_mpg123
 lib_mp3dec=-lmpg123
-CFLAGS += -DMPG123_NO_LARGENAME=1
 endif
 ifeq ($(VORBISLIB),vorbis)
 cpp_vorbisdec=

diff --git a/Quake/snd_mpg123.c b/Quake/snd_mpg123.c
@@ -25,6 +25,7 @@
 #include "snd_mp3.h"
 #include <errno.h>
 
+#define MPG123_NO_LARGENAME
 #define MPG123_DEF_SSIZE_T  /* we do define ssize_t in our stdinc.h */
 #include <mpg123.h>
 
@@ -220,4 +221,3 @@ snd_codec_t mp3_codec =
 };
 
 #endif	/* USE_CODEC_MP3 */
-
diff --git a/Windows/codecs/x64/libmpg123-0.dll b/Windows/codecs/x64/libmpg123-0.dll
diff --git a/Windows/codecs/x86-watcom/mpg123.lib b/Windows/codecs/x86-watcom/mpg123.lib
diff --git a/Windows/codecs/x86/libmpg123-0.dll b/Windows/codecs/x86/libmpg123-0.dll