mirror of
https://github.com/yquake2/yquake2remaster.git
synced 2024-11-10 07:12:07 +00:00
Make uses of pkg-config cross-compilation-friendly
Signed-off-by: Simon McVittie <smcv@debian.org>
This commit is contained in:
parent
6d60ca0919
commit
a0e86c3c36
1 changed files with 9 additions and 5 deletions
14
Makefile
14
Makefile
|
@ -133,6 +133,10 @@ else
|
|||
COMPILER := unknown
|
||||
endif
|
||||
|
||||
# Used to detect libraries. Override to foobar-linux-gnu-pkg-config when
|
||||
# cross-compiling.
|
||||
PKG_CONFIG ?= pkg-config
|
||||
|
||||
# Disable CDA for SDL2
|
||||
ifeq ($(WITH_SDL2),yes)
|
||||
ifeq ($(WITH_CDA),yes)
|
||||
|
@ -254,8 +258,8 @@ endif # SDL2
|
|||
ifneq ($(YQ2_OSTYPE), Windows)
|
||||
ifneq ($(YQ2_OSTYPE), Darwin)
|
||||
ifeq ($(WITH_X11GAMMA),yes)
|
||||
X11CFLAGS := $(shell pkg-config x11 --cflags)
|
||||
X11CFLAGS += $(shell pkg-config xxf86vm --cflags)
|
||||
X11CFLAGS := $(shell $(PKG_CONFIG) x11 --cflags)
|
||||
X11CFLAGS += $(shell $(PKG_CONFIG) xxf86vm --cflags)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
@ -324,9 +328,9 @@ endif # Darwin
|
|||
ifneq ($(YQ2_OSTYPE), Windows)
|
||||
ifneq ($(YQ2_OSTYPE), Darwin)
|
||||
ifeq ($(WITH_X11GAMMA),yes)
|
||||
X11LDFLAGS := $(shell pkg-config x11 --libs)
|
||||
X11LDFLAGS += $(shell pkg-config xxf86vm --libs)
|
||||
X11LDFLAGS += $(shell pkg-config xrandr --libs)
|
||||
X11LDFLAGS := $(shell $(PKG_CONFIG) x11 --libs)
|
||||
X11LDFLAGS += $(shell $(PKG_CONFIG) xxf86vm --libs)
|
||||
X11LDFLAGS += $(shell $(PKG_CONFIG) xrandr --libs)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
|
Loading…
Reference in a new issue