1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
|
From: David Banks <amoebae@gmail.com>
Date: Sun, 12 May 2013 11:10:44 +0100
Subject: Remove redundant linking of vorbis libraries
Makefile attempts to link against libvorbis and libogg when using ogg support,
but these are not required, only libvorbisfile. This avoids an unnecessary
dependency.
Origin: vendor, Debian
---
Quake/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Quake/Makefile b/Quake/Makefile
index d0c8214..862bc7a 100644
--- a/Quake/Makefile
+++ b/Quake/Makefile
@@ -133,11 +133,11 @@ lib_mp3dec=-lmpg123
endif
ifeq ($(VORBISLIB),vorbis)
cpp_vorbisdec=
-lib_vorbisdec=-lvorbisfile -lvorbis -logg
+lib_vorbisdec=-lvorbisfile
endif
ifeq ($(VORBISLIB),tremor)
cpp_vorbisdec=-DVORBIS_USE_TREMOR
-lib_vorbisdec=-lvorbisidec -logg
+lib_vorbisdec=-lvorbisidec
endif
CODECLIBS :=
|