r108 - trunk/code/unix

[DONOTREPLY at icculus.org]

Author: tma
Date: 2005-09-25 18:27:26 -0400 (Sun, 25 Sep 2005)
New Revision: 108

Modified:
   trunk/code/unix/Makefile
Log:
* Don't link against X directly when building the SDL backend


Modified: trunk/code/unix/Makefile
===================================================================
--- trunk/code/unix/Makefile	2005-09-25 22:04:51 UTC (rev 107)
+++ trunk/code/unix/Makefile	2005-09-25 22:27:26 UTC (rev 108)
@@ -171,7 +171,6 @@
 
   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 @@
   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)