aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--Makefile.x1119
2 files changed, 1 insertions, 20 deletions
diff --git a/Makefile b/Makefile
index bb75ac6a2f..04998a0298 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ LIBS += `sdl-config --libs`
# DEFINES += -DUNIX_X11
# LDFLAGS := -L/usr/X11R6/lib -L/usr/local/lib
# INCLUDES+= -I/usr/X11R6/include
-# LIBS += -lpthread
+# LIBS += -lpthread -lXext -lX11
CPPFLAGS= $(DEFINES) $(INCLUDES)
diff --git a/Makefile.x11 b/Makefile.x11
deleted file mode 100644
index fcd8b92ffd..0000000000
--- a/Makefile.x11
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Header$
-
-CC = gcc
-CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -DCOMPRESSED_SOUND_FILE
-DEFINES = -DUNIX_X11
-LDFLAGS := -L/usr/X11R6/lib -L/usr/local/lib
-INCLUDES:= -I/usr/X11R6/include -I./ -I./sound -I/usr/local/include
-CPPFLAGS= $(DEFINES) $(INCLUDES)
-
-# Add -lmad for -DCOMPRESSED_SOUND_FILE
-LIBS = -lXext -lX11 -lncurses -lm -lmad -lpthread
-
-OBJS = x11.o
-
-include Makefile.common
-
-dist:
- rm -f $(ZIPFILE)
- zip -q $(ZIPFILE) $(DISTFILES)