okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Fix a bunch of compile warnings

Browse source 
* Only call pkg-config if it exists
* Remove cl_consoleHistory from README
This commit is contained in:
Tim Angus 2008-05-10 18:51:02 +00:00
parent c45d5403a5
commit a857487f9b
4 changed files with 54 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Makefile
View file

@ -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