From 24fc5a4c6959f07a6925dd2ab1af3da7fd982007 Mon Sep 17 00:00:00 2001 From: Ingo Ruhnke Date: Thu, 19 Nov 2009 00:18:13 +0000 Subject: [PATCH] Moved Menu stuff to its own directory SVN-Revision: 6036 --- CMakeLists.txt | 2 +- SConscript | 2 +- src/control/joystickkeyboardcontroller.cpp | 8 ++++---- src/supertux/game_session.cpp | 2 +- src/{control => supertux/menu}/joystick_menu.cpp | 2 +- src/{control => supertux/menu}/joystick_menu.hpp | 0 src/{control => supertux/menu}/keyboard_menu.cpp | 2 +- src/{control => supertux/menu}/keyboard_menu.hpp | 0 src/supertux/{ => menu}/language_menu.cpp | 2 +- src/supertux/{ => menu}/language_menu.hpp | 0 src/supertux/{ => menu}/options_menu.cpp | 6 +++--- src/supertux/{ => menu}/options_menu.hpp | 0 src/supertux/{ => menu}/profile_menu.cpp | 0 src/supertux/{ => menu}/profile_menu.hpp | 0 src/supertux/title_screen.cpp | 2 +- src/worldmap/worldmap.cpp | 2 +- 16 files changed, 15 insertions(+), 15 deletions(-) rename src/{control => supertux/menu}/joystick_menu.cpp (99%) rename src/{control => supertux/menu}/joystick_menu.hpp (100%) rename src/{control => supertux/menu}/keyboard_menu.cpp (99%) rename src/{control => supertux/menu}/keyboard_menu.hpp (100%) rename src/supertux/{ => menu}/language_menu.cpp (98%) rename src/supertux/{ => menu}/language_menu.hpp (100%) rename src/supertux/{ => menu}/options_menu.cpp (98%) rename src/supertux/{ => menu}/options_menu.hpp (100%) rename src/supertux/{ => menu}/profile_menu.cpp (100%) rename src/supertux/{ => menu}/profile_menu.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b2d1e08b1..52faff5fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -168,7 +168,7 @@ include_directories (${SUPERTUX_SOURCE_DIR}/external/obstack/) ## Build list of sources for supertux binary -FILE(GLOB SUPERTUX_SOURCES RELATIVE ${SUPERTUX_SOURCE_DIR} src/*.cpp src/*/*.cpp src/video/sdl/*.cpp external/obstack/*.c external/tinygettext/*.cpp external/findlocale/findlocale.c) +FILE(GLOB SUPERTUX_SOURCES RELATIVE ${SUPERTUX_SOURCE_DIR} src/*.cpp src/*/*.cpp src/supertux/menu/*.cpp src/video/sdl/*.cpp external/obstack/*.c external/tinygettext/*.cpp external/findlocale/findlocale.c) IF(HAVE_OPENGL) FILE(GLOB SUPERTUX_OPENGL_SOURCES RELATIVE ${SUPERTUX_SOURCE_DIR} src/video/gl/*.cpp) diff --git a/SConscript b/SConscript index 2f2e4ee71..2df0288e4 100644 --- a/SConscript +++ b/SConscript @@ -92,7 +92,7 @@ class Project: version_h.close() # base source - supertux_sources = Glob("src/*.cpp") + Glob("src/*/*.cpp") + supertux_sources = Glob("src/*.cpp") + Glob("src/*/*.cpp") + Glob("src/supertux/menu/*.cpp") # optional video drivers supertux_sources += Glob("src/video/gl/*.cpp") diff --git a/src/control/joystickkeyboardcontroller.cpp b/src/control/joystickkeyboardcontroller.cpp index 6a613a87a..1e1b01cff 100644 --- a/src/control/joystickkeyboardcontroller.cpp +++ b/src/control/joystickkeyboardcontroller.cpp @@ -19,13 +19,13 @@ #include -#include "control/joystick_menu.hpp" -#include "control/keyboard_menu.hpp" -#include "util/writer.hpp" #include "lisp/list_iterator.hpp" -#include "supertux/gameconfig.hpp" #include "supertux/console.hpp" +#include "supertux/gameconfig.hpp" +#include "supertux/menu/joystick_menu.hpp" +#include "supertux/menu/keyboard_menu.hpp" #include "util/gettext.hpp" +#include "util/writer.hpp" JoystickKeyboardController::JoystickKeyboardController() : keymap(), diff --git a/src/supertux/game_session.cpp b/src/supertux/game_session.cpp index 7da344b75..65336e3c6 100644 --- a/src/supertux/game_session.cpp +++ b/src/supertux/game_session.cpp @@ -34,7 +34,7 @@ #include "supertux/levelintro.hpp" #include "supertux/globals.hpp" #include "supertux/mainloop.hpp" -#include "supertux/options_menu.hpp" +#include "supertux/menu/options_menu.hpp" #include "supertux/sector.hpp" #include "util/file_system.hpp" #include "util/gettext.hpp" diff --git a/src/control/joystick_menu.cpp b/src/supertux/menu/joystick_menu.cpp similarity index 99% rename from src/control/joystick_menu.cpp rename to src/supertux/menu/joystick_menu.cpp index f55c8a934..9a81e3746 100644 --- a/src/control/joystick_menu.cpp +++ b/src/supertux/menu/joystick_menu.cpp @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "control/joystick_menu.hpp" +#include "supertux/menu/joystick_menu.hpp" #include diff --git a/src/control/joystick_menu.hpp b/src/supertux/menu/joystick_menu.hpp similarity index 100% rename from src/control/joystick_menu.hpp rename to src/supertux/menu/joystick_menu.hpp diff --git a/src/control/keyboard_menu.cpp b/src/supertux/menu/keyboard_menu.cpp similarity index 99% rename from src/control/keyboard_menu.cpp rename to src/supertux/menu/keyboard_menu.cpp index 9216787ae..a34b97428 100644 --- a/src/control/keyboard_menu.cpp +++ b/src/supertux/menu/keyboard_menu.cpp @@ -15,7 +15,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "control/keyboard_menu.hpp" +#include "supertux/menu/keyboard_menu.hpp" #include "util/gettext.hpp" #include "supertux/gameconfig.hpp" diff --git a/src/control/keyboard_menu.hpp b/src/supertux/menu/keyboard_menu.hpp similarity index 100% rename from src/control/keyboard_menu.hpp rename to src/supertux/menu/keyboard_menu.hpp diff --git a/src/supertux/language_menu.cpp b/src/supertux/menu/language_menu.cpp similarity index 98% rename from src/supertux/language_menu.cpp rename to src/supertux/menu/language_menu.cpp index 57f270940..444821639 100644 --- a/src/supertux/language_menu.cpp +++ b/src/supertux/menu/language_menu.cpp @@ -15,7 +15,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "supertux/language_menu.hpp" +#include "supertux/menu/language_menu.hpp" extern "C" { #include "findlocale.h" diff --git a/src/supertux/language_menu.hpp b/src/supertux/menu/language_menu.hpp similarity index 100% rename from src/supertux/language_menu.hpp rename to src/supertux/menu/language_menu.hpp diff --git a/src/supertux/options_menu.cpp b/src/supertux/menu/options_menu.cpp similarity index 98% rename from src/supertux/options_menu.cpp rename to src/supertux/menu/options_menu.cpp index f77b3dd27..344b38d07 100644 --- a/src/supertux/options_menu.cpp +++ b/src/supertux/menu/options_menu.cpp @@ -15,7 +15,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "supertux/options_menu.hpp" +#include "supertux/menu/options_menu.hpp" #include "audio/sound_manager.hpp" #include "control/joystickkeyboardcontroller.hpp" @@ -24,8 +24,8 @@ #include "supertux/gameconfig.hpp" #include "supertux/globals.hpp" #include "supertux/main.hpp" -#include "supertux/profile_menu.hpp" -#include "supertux/language_menu.hpp" +#include "supertux/menu/profile_menu.hpp" +#include "supertux/menu/language_menu.hpp" #include "util/gettext.hpp" #include "video/renderer.hpp" diff --git a/src/supertux/options_menu.hpp b/src/supertux/menu/options_menu.hpp similarity index 100% rename from src/supertux/options_menu.hpp rename to src/supertux/menu/options_menu.hpp diff --git a/src/supertux/profile_menu.cpp b/src/supertux/menu/profile_menu.cpp similarity index 100% rename from src/supertux/profile_menu.cpp rename to src/supertux/menu/profile_menu.cpp diff --git a/src/supertux/profile_menu.hpp b/src/supertux/menu/profile_menu.hpp similarity index 100% rename from src/supertux/profile_menu.hpp rename to src/supertux/menu/profile_menu.hpp diff --git a/src/supertux/title_screen.cpp b/src/supertux/title_screen.cpp index eb78b22a5..2a5a2da12 100644 --- a/src/supertux/title_screen.cpp +++ b/src/supertux/title_screen.cpp @@ -33,7 +33,7 @@ #include "supertux/gameconfig.hpp" #include "supertux/globals.hpp" #include "supertux/mainloop.hpp" -#include "supertux/options_menu.hpp" +#include "supertux/menu/options_menu.hpp" #include "supertux/resources.hpp" #include "supertux/sector.hpp" #include "supertux/textscroller.hpp" diff --git a/src/worldmap/worldmap.cpp b/src/worldmap/worldmap.cpp index 7ee24fcf8..3fd4ec501 100644 --- a/src/worldmap/worldmap.cpp +++ b/src/worldmap/worldmap.cpp @@ -45,7 +45,7 @@ #include "supertux/game_session.hpp" #include "supertux/globals.hpp" #include "supertux/mainloop.hpp" -#include "supertux/options_menu.hpp" +#include "supertux/menu/options_menu.hpp" #include "supertux/player_status.hpp" #include "supertux/resources.hpp" #include "supertux/sector.hpp" -- 2.11.0