aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2005-09-25 22:27:26 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2005-09-25 22:27:26 +0000
commit2bedbb7b64f24e90ea4dcef102c96fe3690a52b6 (patch)
tree55f0ab6af48438f6ee7c6cba7d063f611c9494f8
parent4a17650af74aa4b90c0c258d3aedff49ab2ac60b (diff)
downloadioquake3-aero-2bedbb7b64f24e90ea4dcef102c96fe3690a52b6.tar.gz
ioquake3-aero-2bedbb7b64f24e90ea4dcef102c96fe3690a52b6.zip
* Don't link against X directly when building the SDL backend
git-svn-id: svn://svn.icculus.org/quake3/trunk@108 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r--code/unix/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/code/unix/Makefile b/code/unix/Makefile
index dfcd43f..8a22bf1 100644
--- a/code/unix/Makefile
+++ b/code/unix/Makefile
@@ -171,7 +171,6 @@ ifeq ($(PLATFORM),linux)
THREAD_LDFLAGS=-lpthread
LDFLAGS=-ldl -lm
- GLLDFLAGS=-L/usr/X11R6/$(LIB) -lX11 -lXext -lXxf86dga -lXxf86vm
DEBUG_CFLAGS += -DHAVE_EXECINFO_H
ifeq ($(BUILD_FREETYPE),1)
@@ -181,7 +180,9 @@ ifeq ($(PLATFORM),linux)
endif
ifeq ($(strip $(USE_SDL)),true)
- GLLDFLAGS+=$(shell sdl-config --libs)
+ GLLDFLAGS=$(shell sdl-config --libs)
+ else
+ GLLDFLAGS=-L/usr/X11R6/$(LIB) -lX11 -lXext -lXxf86dga -lXxf86vm
endif
ifeq ($(ARCH),i386)