diff options
author | ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-08-30 15:35:24 +0000 |
---|---|---|
committer | ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-08-30 15:35:24 +0000 |
commit | 39fe95169562fdf410cb5b0270454cede79b1070 (patch) | |
tree | 48fdce1ab26dd9ea00f6ee023b15af118444c68e /code/unix/Makefile | |
parent | 224a312cb85c18f35f89fd21d7e957f3764fd423 (diff) | |
download | ioquake3-aero-39fe95169562fdf410cb5b0270454cede79b1070.tar.gz ioquake3-aero-39fe95169562fdf410cb5b0270454cede79b1070.zip |
fix build against system libfreetype
git-svn-id: svn://svn.icculus.org/quake3/trunk@30 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/unix/Makefile')
-rw-r--r-- | code/unix/Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/code/unix/Makefile b/code/unix/Makefile index 10e8dc5..2e4dafc 100644 --- a/code/unix/Makefile +++ b/code/unix/Makefile @@ -46,7 +46,7 @@ BDIR=$(MOUNT_DIR)/../run # BUILD_NAME=$(BUILD_NAME) BUILD_NAME=quake3 - +BUILD_FREETYPE=0 ############################################################################# ## @@ -156,6 +156,13 @@ ifeq ($(PLATFORM),linux) LDFLAGS=-ldl -lm GLLDFLAGS=-L/usr/X11R6/$(LIB) -lX11 -lXext -lXxf86dga -lXxf86vm + DEBUG_CFLAGS += -DHAVE_EXECINFO_H + ifeq ($(BUILD_FREETYPE),1) + RELEASE_CFLAGS += $(shell pkg-config --cflags freetype2) -DBUILD_FREETYPE + DEBUG_CFLAGS += $(shell pkg-config --cflags freetype2) -DBUILD_FREETYPE + LDFLAGS += $(shell pkg-config --libs freetype2) + endif + ifeq ($(ARCH),i386) # linux32 make ... BASE_CFLAGS += -m32 |