diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-05-10 18:51:02 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-05-10 18:51:02 +0000 |
| commit | 0105de5aeed6816adc5383c14db47a909308be09 (patch) | |
| tree | 68b08547fa62f2358310535a7e32d509e348a269 /Makefile | |
| parent | ea58233e3370adf79d2830003b9c736716622b9b (diff) | |
| download | ioquake3-aero-0105de5aeed6816adc5383c14db47a909308be09.tar.gz ioquake3-aero-0105de5aeed6816adc5383c14db47a909308be09.zip | |
* Fix a bunch of compile warnings
* Only call pkg-config if it exists
* Remove cl_consoleHistory from README
git-svn-id: svn://svn.icculus.org/quake3/trunk@1342 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 22 |
1 files changed, 12 insertions, 10 deletions
@@ -160,13 +160,15 @@ TEMPDIR=/tmp # set PKG_CONFIG_PATH to influence this, e.g. # PKG_CONFIG_PATH=/opt/cross/i386-mingw32msvc/lib/pkgconfig -CURL_CFLAGS=$(shell pkg-config --cflags libcurl) -CURL_LIBS=$(shell pkg-config --libs libcurl) -OPENAL_CFLAGS=$(shell pkg-config --cflags openal) -OPENAL_LIBS=$(shell pkg-config --libs openal) -# FIXME: introduce CLIENT_CFLAGS -SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//') -SDL_LIBS=$(shell pkg-config --libs sdl) +ifeq ($(shell which pkg-config > /dev/null; echo $$?),0) + CURL_CFLAGS=$(shell pkg-config --cflags libcurl) + CURL_LIBS=$(shell pkg-config --libs libcurl) + OPENAL_CFLAGS=$(shell pkg-config --cflags openal) + OPENAL_LIBS=$(shell pkg-config --libs openal) + # FIXME: introduce CLIENT_CFLAGS + SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//') + SDL_LIBS=$(shell pkg-config --libs sdl) +endif # version info VERSION=1.35 @@ -383,9 +385,9 @@ else # ifeq darwin ifeq ($(PLATFORM),mingw32) -ifndef WINDRES -WINDRES=windres -endif + ifndef WINDRES + WINDRES=windres + endif ARCH=x86 |