* Unquieten [pkg|sdl]-config for the time being

This commit is contained in:
Tim Angus 2009-10-13 16:33:54 +00:00
parent 639fdb4ed3
commit 2fd7ffe754

View file

@ -181,7 +181,7 @@ TEMPDIR=/tmp
ifneq ($(BUILD_CLIENT),0) 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
ifeq ($(shell which pkg-config &> /dev/null; echo $$?),0) ifeq ($(shell which pkg-config > /dev/null; echo $$?),0)
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)
@ -192,7 +192,7 @@ ifneq ($(BUILD_CLIENT),0)
endif endif
# Use sdl-config if all else fails # Use sdl-config if all else fails
ifeq ($(SDL_CFLAGS),) ifeq ($(SDL_CFLAGS),)
ifeq ($(shell which sdl-config &> /dev/null; echo $$?),0) ifeq ($(shell which sdl-config > /dev/null; echo $$?),0)
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