[Scummvm-cvs-logs] CVS: scummvm Makefile,1.42,1.43 Makefile.x11,1.4,NONE

[Lionel Ulmer]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv26927

Modified Files:
	Makefile 
Removed Files:
	Makefile.x11 
Log Message:
Fix X11 compiling with the new unified Makefile and remove the old
Makefile.x11



Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- Makefile	16 May 2002 06:46:50 -0000	1.42
+++ Makefile	16 May 2002 18:45:58 -0000	1.43
@@ -29,7 +29,7 @@
 # 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)

--- Makefile.x11 DELETED ---