fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-13 07:21:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Quake/Makefile
View file

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