diff options
| author | Lionel Ulmer | 2002-05-16 18:45:58 +0000 |
|---|---|---|
| committer | Lionel Ulmer | 2002-05-16 18:45:58 +0000 |
| commit | db4e603fdef642aafc5bc52e267f1fb12a8bfe37 (patch) | |
| tree | db0c40c43f7f87d876906759f7fad1019b900e17 | |
| parent | 6982fe9e47c2c3e559a100c5cb1d8730277ef953 (diff) | |
| download | scummvm-rg350-db4e603fdef642aafc5bc52e267f1fb12a8bfe37.tar.gz scummvm-rg350-db4e603fdef642aafc5bc52e267f1fb12a8bfe37.tar.bz2 scummvm-rg350-db4e603fdef642aafc5bc52e267f1fb12a8bfe37.zip | |
Fix X11 compiling with the new unified Makefile and remove the old
Makefile.x11
svn-id: r4343
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Makefile.x11 | 19 |
2 files changed, 1 insertions, 20 deletions
@@ -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) |