Allow user override of cURL, OpenAL, and SDL libs/cflags

This commit is contained in:
Zack Middleton 2014-07-20 17:39:27 -05:00
parent a8dcf60b76
commit 48738599a0

View file

@ -270,22 +270,22 @@ ifneq ($(BUILD_CLIENT),0)
# set PKG_CONFIG_PATH to influence this, e.g. # set PKG_CONFIG_PATH to influence this, e.g.
# PKG_CONFIG_PATH=/opt/cross/i386-mingw32msvc/lib/pkgconfig # PKG_CONFIG_PATH=/opt/cross/i386-mingw32msvc/lib/pkgconfig
ifneq ($(call bin_path, pkg-config),) ifneq ($(call bin_path, pkg-config),)
CURL_CFLAGS=$(shell pkg-config --silence-errors --cflags libcurl) CURL_CFLAGS ?= $(shell pkg-config --silence-errors --cflags libcurl)
CURL_LIBS=$(shell pkg-config --silence-errors --libs libcurl) CURL_LIBS ?= $(shell pkg-config --silence-errors --libs libcurl)
OPENAL_CFLAGS=$(shell pkg-config --silence-errors --cflags openal) OPENAL_CFLAGS ?= $(shell pkg-config --silence-errors --cflags openal)
OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal) OPENAL_LIBS ?= $(shell pkg-config --silence-errors --libs openal)
SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//') SDL_CFLAGS ?= $(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//')
SDL_LIBS=$(shell pkg-config --silence-errors --libs sdl) SDL_LIBS ?= $(shell pkg-config --silence-errors --libs sdl)
else else
# assume they're in the system default paths (no -I or -L needed) # assume they're in the system default paths (no -I or -L needed)
CURL_LIBS=-lcurl CURL_LIBS ?= -lcurl
OPENAL_LIBS=-lopenal OPENAL_LIBS ?= -lopenal
endif endif
# Use sdl-config if all else fails # Use sdl-config if all else fails
ifeq ($(SDL_CFLAGS),) ifeq ($(SDL_CFLAGS),)
ifneq ($(call bin_path, sdl-config),) ifneq ($(call bin_path, sdl-config),)
SDL_CFLAGS=$(shell sdl-config --cflags) SDL_CFLAGS ?= $(shell sdl-config --cflags)
SDL_LIBS=$(shell sdl-config --libs) SDL_LIBS ?= $(shell sdl-config --libs)
endif endif
endif endif
endif endif