From c48c4f2641f94089327b9136ef9b17d5f7a10b3c Mon Sep 17 00:00:00 2001 From: Shpoike Date: Mon, 6 Sep 2021 12:40:03 +0100 Subject: [PATCH] Fix up some dodgy makefiles. --- quakespasm/Quake/Makefile.w32 | 7 +++---- quakespasm/Quake/Makefile.w64 | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/quakespasm/Quake/Makefile.w32 b/quakespasm/Quake/Makefile.w32 index 2f5d187d..fb49bb90 100644 --- a/quakespasm/Quake/Makefile.w32 +++ b/quakespasm/Quake/Makefile.w32 @@ -107,11 +107,11 @@ $(error Invalid MP3LIB setting) endif endif ifeq ($(MP3LIB),mad) -mp3_obj=snd_mp3 +mp3_obj=snd_mp3.o snd_mp3tag.o lib_mp3dec=-lmad endif ifeq ($(MP3LIB),mpg123) -mp3_obj=snd_mpg123 +mp3_obj=snd_mpg123.o snd_mp3tag.o lib_mp3dec=-lmpg123 endif ifeq ($(VORBISLIB),vorbis) @@ -204,8 +204,7 @@ MUSIC_OBJS:= bgmusic.o \ snd_wave.o \ snd_vorbis.o \ snd_opus.o \ - $(mp3_obj).o \ - snd_mp3tag.o \ + $(mp3_obj) \ snd_mikmod.o \ snd_xmp.o \ snd_umx.o diff --git a/quakespasm/Quake/Makefile.w64 b/quakespasm/Quake/Makefile.w64 index ce7a8a5c..507ba133 100644 --- a/quakespasm/Quake/Makefile.w64 +++ b/quakespasm/Quake/Makefile.w64 @@ -105,11 +105,11 @@ $(error Invalid MP3LIB setting) endif endif ifeq ($(MP3LIB),mad) -mp3_obj=snd_mp3.o +mp3_obj=snd_mp3.o snd_mp3tag.o lib_mp3dec=-lmad endif ifeq ($(MP3LIB),mpg123) -mp3_obj=snd_mpg123.o +mp3_obj=snd_mpg123.o snd_mp3tag.o lib_mp3dec=-lmpg123 endif ifeq ($(VORBISLIB),vorbis)