aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2008-12-08 21:48:29 +0000
committerJohannes Schickel2008-12-08 21:48:29 +0000
commit3334af5507db24208ca8a6f1aa8852281a017f82 (patch)
treedb3a5cf9252cb76878c2d2b9f708a96e5ca1077f
parent1eefecffa4670130008a9094c2855e4b1b9fe3a3 (diff)
downloadscummvm-rg350-3334af5507db24208ca8a6f1aa8852281a017f82.tar.gz
scummvm-rg350-3334af5507db24208ca8a6f1aa8852281a017f82.tar.bz2
scummvm-rg350-3334af5507db24208ca8a6f1aa8852281a017f82.zip
Removed last traces of X11 backend.
svn-id: r35287
-rw-r--r--common/scummsys.h7
-rwxr-xr-xconfigure9
2 files changed, 1 insertions, 15 deletions
diff --git a/common/scummsys.h b/common/scummsys.h
index 0d6ec4ee82..c349cc8c83 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -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
diff --git a/configure b/configure
index ce807e68e5..85930143eb 100755
--- a/configure
+++ b/configure
@@ -585,7 +585,7 @@ Usage: $0 [OPTIONS]...
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 @@ case $_backend in
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"