fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix up some dodgy makefiles.

This commit is contained in:
Shpoike 2021-09-06 12:40:03 +01:00
parent 8b676fcb73
commit c48c4f2641
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
quakespasm/Quake/Makefile.w32
View File

@ -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

4
quakespasm/Quake/Makefile.w64
View File

@ -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)