Removed the --small-gui build option.

Starting Wesnoth with the --smallgui parameter achieves the same. The
other code workarounds for smallgui are already gone.

CMakeLists.txt

@@ -59,7 +59,7 @@ set(PREFERENCES_DIR "" CACHE STRING "Use a non-default preferences directory (.w
 option(ENABLE_PYTHON "Enable in-game python extensions" ON)
 option(ENABLE_FRIBIDI "Enable FriBIDi support" ON)
 option(ENABLE_DUMMY_LOCALES "Create dummy locales")
-set(GUI "normal" CACHE STRING "Set for GUI reductions for resolutions down to 800x480 (eeePC, Nokia 8x0) or 320x240 (PDAs) (normal|small|tiny)")
+set(GUI "normal" CACHE STRING "Set for GUI reductions for resolutions down to 320x240 (PDAs) (normal|tiny)")
 
 #server options
 set(SERVER_UID "" CACHE STRING "User id of the user who runs wesnothd")
@@ -120,8 +120,6 @@ endif(PREFERENCES_DIR)
 
 if(GUI STREQUAL "tiny")
   add_definitions(-DUSE_TINY_GUI)
-elseif(GUI STREQUAL "small")
-  add_definitions(-DUSE_SMALL_GUI)
 endif(GUI STREQUAL "tiny")
 
 if(ENABLE_PYTHON AND PYTHON_LIBRARIES)

INSTALL

@@ -194,7 +194,6 @@ Optional Features:
   --enable-python-install   N/A
   --enable-lite             N/A
   --enable-tinygui          gui=tiny
-  --enable-smallgui         gui=small
   --enable-optipng          N/A
   --enable-lowmem           lowmem=yes
   --disable-game            (See --help documentation on choice of targets)

RELEASE_NOTES

@@ -27,3 +27,8 @@ Building Wesnoth now requires fontconfig 2.4.2 or higher (only tested with
 requirements are added.
 
 ***
+
+Removed the --small-gui build option, starting Wesnoth with the --smallgui
+parameter achieves the same.
+
+***

SConstruct

@@ -69,7 +69,7 @@ opts.AddOptions(
     BoolOption('raw_sockets', 'Set to use raw receiving sockets in the multiplayer network layer rather than the SDL_net facilities', False),
     ('server_gid', 'group id of the user who runs wesnothd', ""),
     ('server_uid', 'user id of the user who runs wesnothd', ""),
-    EnumOption('gui', 'Set for GUI reductions for resolutions down to 800x480 (eeePC, Nokia 8x0) or 320x240 (PDAs)', "normal", ["normal", "small", "tiny"]),
+    EnumOption('gui', 'Set for GUI reductions for resolutions down to 320x240 (PDAs)', "normal", ["normal", "tiny"]),
     BoolOption('static', 'Set to enable static building of Wesnoth', False),
     BoolOption('strict', 'Set to strict compilation', False),
     BoolOption('static_test', 'Staticaly build against boost test (Not supported yet)', False),
@@ -275,9 +275,6 @@ if env['strict']:
 if env['gui'] == 'tiny':
     env.Append(CPPDEFINES = "USE_TINY_GUI")
 
-if env['gui'] == 'small':
-    env.Append(CPPDEFINES = "USE_SMALL_GUI")
-
 if env['lowmem']:
     env.Append(CPPDEFINES = "LOW_MEM")
 

changelog

@@ -64,6 +64,8 @@ Version 1.5.3+svn:
      triggering of a matching "turn *" event).
    * Removed the compiler work arounds for MSVC6.
    * Added some more compiler workarounds for MSVC9.
+   * Removed the --small-gui build option, starting Wesnoth with the
+     --smallgui parameter achieves the same
 
 Version 1.5.3:
  * Campaigns

configure.ac

@@ -138,18 +138,6 @@ fi
 
 AM_CONDITIONAL([TINYGUI], [test "x$tinygui" = "xyes"])
 
-AC_ARG_ENABLE([smallgui],
-              AS_HELP_STRING([--enable-smallgui], [enable GUI reductions for resolutions down to 800x480 (eeePC, Nokia 8x0)]),
-          [smallgui=$enableval],
-          [smallgui=no])
-
-if test "x$smallgui" = "xyes"
-then
-    CPPFLAGS="$CPPFLAGS -DUSE_SMALL_GUI"
-fi
-
-AM_CONDITIONAL([SMALLGUI], [test "x$smallgui" = "xyes"])
-
 AC_ARG_ENABLE([lowmem],
               AS_HELP_STRING([--enable-lowmem], [reduce memory usage by removing extra functionality]),
 	      [lowmem=$enableval],

src/game.cpp

@@ -382,11 +382,6 @@ game_controller::game_controller(int argc, char** argv) :
 	}
 	std::cerr << "Data at '" << game_config::path << "'\n";
 
-	//TODO: remove this and the configure option
-#ifdef USE_SMALL_GUI
-	game_config::small_gui = true;
-#endif
-
 	// disable sound in nosound mode, or when sound engine failed to initialize
 	if (no_sound || ((preferences::sound_on() || preferences::music_on() ||
 	                  preferences::turn_bell() || preferences::UI_sound_on()) &&