mirror of
https://github.com/Shpoike/Quakespasm.git
synced 2025-02-02 22:11:22 +00:00
Merge /u/smcvittie/quakespasm/ branch cross-pkg-config into master
https://sourceforge.net/p/quakespasm/quakespasm/merge-requests/2/
This commit is contained in:
commit
66df5d09f4
1 changed files with 3 additions and 2 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue