[Scummvm-cvs-logs] SF.net SVN: scummvm:[35287] scummvm/trunk

[lordhoto at users.sourceforge.net]

Revision: 35287
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35287&view=rev
Author:   lordhoto
Date:     2008-12-08 21:48:29 +0000 (Mon, 08 Dec 2008)

Log Message:
-----------
Removed last traces of X11 backend.

Modified Paths:
--------------
    scummvm/trunk/common/scummsys.h
    scummvm/trunk/configure

Modified: scummvm/trunk/common/scummsys.h
===================================================================
--- scummvm/trunk/common/scummsys.h	2008-12-08 21:11:19 UTC (rev 35286)
+++ scummvm/trunk/common/scummsys.h	2008-12-08 21:48:29 UTC (rev 35287)
@@ -251,12 +251,6 @@
 	#define scumm_strnicmp strncasecmp
 
 	#ifndef CONFIG_H
-		#ifdef X11_BACKEND
-
-		// You need to set this manually if necessary
-	//	#define SCUMM_LITTLE_ENDIAN
-
-		#else
 		/* need this for the SDL_BYTEORDER define */
 		#include <SDL_byteorder.h>
 
@@ -267,7 +261,6 @@
 		#else
 		#error Neither SDL_BIG_ENDIAN nor SDL_LIL_ENDIAN is set.
 		#endif
-		#endif
 	#endif
 
 	// You need to set this manually if necessary

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2008-12-08 21:11:19 UTC (rev 35286)
+++ scummvm/trunk/configure	2008-12-08 21:48:29 UTC (rev 35287)
@@ -585,7 +585,7 @@
 
 Configuration:
   -h, --help             display this help and exit
-  --backend=BACKEND      backend to build (sdl, x11, morphos, dc, gp2x, iphone, null) [sdl]
+  --backend=BACKEND      backend to build (sdl, morphos, dc, gp2x, iphone, null) [sdl]
 
 Installation directories:
   --prefix=DIR           use this prefix for installing ScummVM [/usr/local]
@@ -1718,13 +1718,6 @@
 		CXXFLAGS="$CXXFLAGS -march=armv4t"
 		MODULES="$MODULES backends/platform/gp2x"
 		;;
-	x11)
-		INCLUDES="$INCLUDES -I/usr/X11R6/include"
-		LIBS="$LIBS -lpthread -lXext -lX11"
-		LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/usr/local/lib"
-		DEFINES="$DEFINES -DX11_BACKEND"
-		MODULES="$MODULES backends/platform/x11"
-		;;
 	iphone)
 		OBJCFLAGS="$OBJCFLAGS --std=c99"
 		LIBS="$LIBS -lobjc -framework UIKit -framework CoreGraphics -framework CoreSurface -framework LayerKit -framework GraphicsServices -framework CoreFoundation -framework Foundation -framework AudioToolbox -framework CoreAudio"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.