Merge /u/smcvittie/quakespasm/ branch cross-pkg-config into master

https://sourceforge.net/p/quakespasm/quakespasm/merge-requests/2/
This commit is contained in:
Ozkan Sezer 2021-01-07 14:55:24 +00:00
commit 66df5d09f4

View file

@ -46,6 +46,7 @@ CC ?= gcc
LINKER = $(CC)
STRIP ?= strip
PKG_CONFIG ?= pkg-config
#CPUFLAGS= -mtune=i686
#CPUFLAGS= -march=pentium4
@ -153,8 +154,8 @@ ifeq ($(USE_CODEC_OPUS),1)
# but they include the headers without the opus directory
# prefix and rely on pkg-config. ewww...
CFLAGS+= -DUSE_CODEC_OPUS
CFLAGS+= $(shell pkg-config --cflags opusfile)
CODECLIBS+= $(shell pkg-config --libs opusfile)
CFLAGS+= $(shell $(PKG_CONFIG) --cflags opusfile)
CODECLIBS+= $(shell $(PKG_CONFIG) --libs opusfile)
endif
ifeq ($(USE_CODEC_VORBIS),1)
CFLAGS+= -DUSE_CODEC_VORBIS $(cpp_vorbisdec)