0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove the editor option.

Browse source 
This changes causes the editor to be always build. It also sorts the
file entries in the build systems.

loonycyborg please review the scons changes.
This commit is contained in:
Mark de Wever 2011-02-19 12:25:05 +00:00
parent 2f668127bf
commit ff422edc9c
15 changed files with 168 additions and 247 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
CMakeLists.txt
View file

@ -66,7 +66,6 @@ set(FIFO_DIR "/var/run/wesnothd" CACHE STRING "Directory for the wesnothd fifo s
option(ENABLE_GAME "Enable compilation of the game" ON)
option(ENABLE_CAMPAIGN_SERVER "Enable compilation of campaign server")
option(ENABLE_SERVER "Enable compilation of server" ON)
option(ENABLE_EDITOR "Enable compilation of the new map editor into the game executable" ON)
option(ENABLE_TOOLS "Enable building and installation of tools for artists and WML maintainers")
option(ENABLE_TESTS "Build unit tests")
option(ENABLE_NLS "Enable building of translations" ON)
@ -143,10 +142,6 @@ if(NOT ENABLE_POOL_ALLOC OR WIN32)
add_definitions(-DDISABLE_POOL_ALLOC)
endif(NOT ENABLE_POOL_ALLOC OR WIN32)
if(NOT ENABLE_EDITOR)
add_definitions(-DDISABLE_EDITOR)
endif(NOT ENABLE_EDITOR)
if(X11_FOUND)
add_definitions(-D_X11)
endif(X11_FOUND)
@ -272,16 +267,14 @@ if(ENABLE_DESKTOP_ENTRY AND ENABLE_GAME)
install(FILES icons/wesnoth.desktop DESTINATION ${DESKTOPDIR} )
install(FILES icons/wesnoth-icon.png DESTINATION ${ICONDIR} )
if(ENABLE_EDITOR)
# do some crude string replacing to have the real binary name in the .desktop file (read in original .desktop file, replace the Exec= line with the correct value and output the generated file)
# file(READ icons/wesnoth_editor.desktop wesnoth-editor-desktop-orig)
# string(REPLACE "Exec=wesnoth -e" "Exec=${BINARY_PREFIX}wesnoth${BINARY_SUFFIX} -e" wesnoth-editor-desktop-modified ${wesnoth-editor-desktop-orig} )
# file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_PREFIX}wesnoth_editor${BINARY_SUFFIX}.desktop ${wesnoth-editor-desktop-modified} )
# install the generated .desktop file
# install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_PREFIX}wesnoth_editor${BINARY_SUFFIX}.desktop DESTINATION ${DESKTOPDIR} )
install(FILES icons/wesnoth_editor.desktop DESTINATION ${DESKTOPDIR} )
install(FILES icons/wesnoth_editor-icon.png DESTINATION ${ICONDIR} )
endif(ENABLE_EDITOR)
# do some crude string replacing to have the real binary name in the .desktop file (read in original .desktop file, replace the Exec= line with the correct value and output the generated file)
# file(READ icons/wesnoth_editor.desktop wesnoth-editor-desktop-orig)
# string(REPLACE "Exec=wesnoth -e" "Exec=${BINARY_PREFIX}wesnoth${BINARY_SUFFIX} -e" wesnoth-editor-desktop-modified ${wesnoth-editor-desktop-orig} )
# file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_PREFIX}wesnoth_editor${BINARY_SUFFIX}.desktop ${wesnoth-editor-desktop-modified} )
# install the generated .desktop file
# install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_PREFIX}wesnoth_editor${BINARY_SUFFIX}.desktop DESTINATION ${DESKTOPDIR} )
install(FILES icons/wesnoth_editor.desktop DESTINATION ${DESKTOPDIR} )
install(FILES icons/wesnoth_editor-icon.png DESTINATION ${ICONDIR} )
endif(ENABLE_DESKTOP_ENTRY AND ENABLE_GAME)

1
INSTALL
View file

@ -200,7 +200,6 @@ Optional Features:
--disable-game (See --help documentation on choice of targets)
--enable-server (See --help documentation on choice of targets)
--enable-campaign-server (See --help documentation on choice of targets)
--enable-editor (See --help documentation on choice of targets)
--enable-tools (See --help documentation on choice of targets)
--enable-internal-data internal_data=yes
--enable-raw-sockets raw_sockets=yes

3
RELEASE_NOTES
View file

@ -14,7 +14,8 @@ Since Tiny-GUI, a system that scaled images down at install time to a smaller si
***
REPLACE ME WITH CONTENT...
The option to build without the editor has been removed. The editor is now
always build.
***

4
SConstruct
View file

@ -68,7 +68,6 @@ opts.AddVariables(
PathVariable('mandir', 'sets the man pages directory to a non-default location', "$datarootdir/man", PathVariable.PathAccept),
PathVariable('docdir', 'sets the doc directory to a non-default location', "$datarootdir/doc/wesnoth", PathVariable.PathAccept),
PathVariable('python_site_packages_dir', 'sets the directory where python modules are installed', "lib/python/site-packages/wesnoth", PathVariable.PathAccept),
BoolVariable('editor', 'Enable editor', True),
BoolVariable('lowmem', 'Set to reduce memory usage by removing extra functionality', False),
BoolVariable('notifications', 'Enable support for desktop notifications', True),
BoolVariable('nls','enable compile/install of gettext message catalogs',True),
@ -391,9 +390,6 @@ for env in [test_env, client_env, env]:
if env['internal_data']:
env.Append(CPPDEFINES = "USE_INTERNAL_DATA")
if not env["editor"]:
env.Append(CPPDEFINES = "DISABLE_EDITOR")
if env["PLATFORM"] == "win32":
env["pool_alloc"] = False

1
changelog
View file

@ -34,6 +34,7 @@ Version 1.9.4+svn:
still works (and is necessary when in windowed mode).
* Let cmake use absolute locale dirs when set to an absolute path.
(Windows always uses a relative path.) (patch #2280)
* Make it impossible to build Wesnoth without the editor.
Version 1.9.4:
* AI:

91
src/CMakeLists.txt
View file

@ -317,14 +317,14 @@ set(wesnoth-main_SRC
ai/lua/core.cpp
ai/manager.cpp
ai/registry.cpp
ai/testing.cpp
ai/testing/aspect_attacks.cpp
ai/testing/ca.cpp
ai/testing/ca_global_fallback.cpp
ai/testing/ca_testing_move_to_targets.cpp
ai/testing/ca_testing_recruitment.cpp
ai/testing/stage_rca.cpp
ai/testing/stage_fallback.cpp
ai/testing.cpp
ai/testing/stage_rca.cpp
animated_game.cpp
attack_prediction.cpp
attack_prediction_display.cpp
@ -332,14 +332,26 @@ set(wesnoth-main_SRC
config_cache.cpp
controller_base.cpp
dialogs.cpp
editor/action.cpp
editor/brush.cpp
editor/editor_controller.cpp
editor/editor_display.cpp
editor/editor_layout.cpp
editor/editor_main.cpp
editor/editor_map.cpp
editor/editor_palettes.cpp
editor/editor_preferences.cpp
editor/map_context.cpp
editor/map_fragment.cpp
editor/mouse_action.cpp
exceptions.cpp
floating_textbox.cpp
formula.cpp
formula_debugger.cpp
formula_debugger_fwd.cpp
formula_function.cpp
formula_tokenizer.cpp
formula_string_utils.cpp
formula_tokenizer.cpp
game_display.cpp
game_events.cpp
game_preferences.cpp
@ -377,9 +389,10 @@ set(wesnoth-main_SRC
gui/auxiliary/widget_definition/tree_view.cpp
gui/auxiliary/widget_definition/vertical_scrollbar.cpp
gui/auxiliary/widget_definition/window.cpp
gui/auxiliary/window_builder.cpp
gui/auxiliary/window_builder/button.cpp
gui/auxiliary/window_builder/drawing.cpp
gui/auxiliary/window_builder/control.cpp
gui/auxiliary/window_builder/drawing.cpp
gui/auxiliary/window_builder/helper.cpp
gui/auxiliary/window_builder/horizontal_listbox.cpp
gui/auxiliary/window_builder/horizontal_scrollbar.cpp
@ -388,6 +401,9 @@ set(wesnoth-main_SRC
gui/auxiliary/window_builder/listbox.cpp
gui/auxiliary/window_builder/minimap.cpp
gui/auxiliary/window_builder/multi_page.cpp
gui/auxiliary/window_builder/panel.cpp
gui/auxiliary/window_builder/password_box.cpp
gui/auxiliary/window_builder/progress_bar.cpp
gui/auxiliary/window_builder/repeating_button.cpp
gui/auxiliary/window_builder/scroll_label.cpp
gui/auxiliary/window_builder/scrollbar_panel.cpp
@ -396,25 +412,25 @@ set(wesnoth-main_SRC
gui/auxiliary/window_builder/stacked_widget.cpp
gui/auxiliary/window_builder/text_box.cpp
gui/auxiliary/window_builder/toggle_button.cpp
gui/auxiliary/window_builder/vertical_scrollbar.cpp
gui/auxiliary/window_builder/panel.cpp
gui/auxiliary/window_builder/progress_bar.cpp
gui/auxiliary/window_builder/password_box.cpp
gui/auxiliary/window_builder/toggle_panel.cpp
gui/auxiliary/window_builder/tree_view.cpp
gui/auxiliary/window_builder.cpp
gui/auxiliary/window_builder/vertical_scrollbar.cpp
gui/dialogs/addon/description.cpp
gui/dialogs/addon_connect.cpp
gui/dialogs/addon_list.cpp
gui/dialogs/addon/description.cpp
gui/dialogs/campaign_difficulty.cpp
gui/dialogs/campaign_selection.cpp
gui/dialogs/data_manage.cpp
gui/dialogs/debug_clock.cpp
gui/dialogs/dialog.cpp
gui/dialogs/edit_label.cpp
gui/dialogs/editor_generate_map.cpp
gui/dialogs/editor_new_map.cpp
gui/dialogs/editor_resize_map.cpp
gui/dialogs/editor_settings.cpp
gui/dialogs/formula_debugger.cpp
gui/dialogs/game_load.cpp
gui/dialogs/game_delete.cpp
gui/dialogs/game_load.cpp
gui/dialogs/game_save.cpp
gui/dialogs/gamestate_inspector.cpp
gui/dialogs/language_selection.cpp
@ -423,24 +439,24 @@ set(wesnoth-main_SRC
gui/dialogs/lobby_main.cpp
gui/dialogs/lobby_player_info.cpp
gui/dialogs/message.cpp
gui/dialogs/mp_cmd_wrapper.cpp
gui/dialogs/mp_connect.cpp
gui/dialogs/mp_create_game.cpp
gui/dialogs/mp_create_game_set_password.cpp
gui/dialogs/mp_method_selection.cpp
gui/dialogs/mp_cmd_wrapper.cpp
gui/dialogs/popup.cpp
gui/dialogs/simple_item_selector.cpp
gui/dialogs/tip.cpp
gui/dialogs/title_screen.cpp
gui/dialogs/transient_message.cpp
gui/dialogs/tip.cpp
gui/dialogs/unit_attack.cpp
gui/dialogs/unit_create.cpp
gui/dialogs/wml_message.cpp
gui/widgets/button.cpp
gui/widgets/drawing.cpp
gui/widgets/control.cpp
gui/widgets/container.cpp
gui/widgets/control.cpp
gui/widgets/debug.cpp
gui/widgets/drawing.cpp
gui/widgets/generator.cpp
gui/widgets/grid.cpp
gui/widgets/helper.cpp
@ -452,14 +468,14 @@ set(wesnoth-main_SRC
gui/widgets/minimap.cpp
gui/widgets/multi_page.cpp
gui/widgets/panel.cpp
gui/widgets/progress_bar.cpp
gui/widgets/password_box.cpp
gui/widgets/progress_bar.cpp
gui/widgets/repeating_button.cpp
gui/widgets/settings.cpp
gui/widgets/scroll_label.cpp
gui/widgets/scrollbar.cpp
gui/widgets/scrollbar_container.cpp
gui/widgets/scrollbar_panel.cpp
gui/widgets/scrollbar.cpp
gui/widgets/settings.cpp
gui/widgets/slider.cpp
gui/widgets/spacer.cpp
gui/widgets/stacked_widget.cpp
@ -481,19 +497,18 @@ set(wesnoth-main_SRC
mouse_handler_base.cpp
mp_game_settings.cpp
multiplayer.cpp
multiplayer_ui.cpp
multiplayer_wait.cpp
multiplayer_connect.cpp
multiplayer_create.cpp
multiplayer_lobby.cpp
${network_implementation_files} # network.cpp and network_worker.cpp are included by default (without USE_ANA_NETWORK)
multiplayer_ui.cpp
multiplayer_wait.cpp
pathfind/pathfind.cpp
pathfind/teleport.cpp
persist_context.cpp
persist_manager.cpp
persist_var.cpp
playcampaign.cpp
play_controller.cpp
playcampaign.cpp
playmp_controller.cpp
playsingle_controller.cpp
playturn.cpp
@ -505,13 +520,13 @@ set(wesnoth-main_SRC
savegame.cpp
savegame_config.cpp
scripting/lua.cpp
sha1.cpp
settings.cpp
sha1.cpp
side_filter.cpp
statistics.cpp
statistics_dialog.cpp
storyscreen/interface.cpp
storyscreen/controller.cpp
storyscreen/interface.cpp
storyscreen/part.cpp
storyscreen/render.cpp
team.cpp
@ -531,10 +546,10 @@ set(wesnoth-main_SRC
variant.cpp
whiteboard/action.cpp
whiteboard/attack.cpp
whiteboard/manager.cpp
whiteboard/move.cpp
whiteboard/highlight_visitor.cpp
whiteboard/manager.cpp
whiteboard/mapbuilder_visitor.cpp
whiteboard/move.cpp
whiteboard/recall.cpp
whiteboard/recruit.cpp
whiteboard/side_actions.cpp
@ -545,31 +560,9 @@ set(wesnoth-main_SRC
widgets/combo_drag.cpp
widgets/drop_target.cpp
widgets/scrollpane.cpp
${network_implementation_files} # network.cpp and network_worker.cpp are included by default (without USE_ANA_NETWORK)
)
if(ENABLE_EDITOR)
set(wesnoth-main_SRC
gui/dialogs/editor_generate_map.cpp
gui/dialogs/editor_new_map.cpp
gui/dialogs/editor_resize_map.cpp
gui/dialogs/editor_settings.cpp
editor/action.cpp
editor/brush.cpp
editor/editor_main.cpp
editor/editor_controller.cpp
editor/editor_display.cpp
editor/editor_layout.cpp
editor/editor_map.cpp
editor/editor_palettes.cpp
editor/editor_preferences.cpp
editor/map_context.cpp
editor/map_fragment.cpp
editor/mouse_action.cpp
${wesnoth-main_SRC}
)
endif(ENABLE_EDITOR)
########### libwesnoth-game ###############
# rename libwesnoth.a to libwesnoth-game.a to have clearer targets

222
src/SConscript
View file

@ -186,14 +186,14 @@ wesnoth_sources = Split("""
ai/lua/core.cpp
ai/manager.cpp
ai/registry.cpp
ai/testing.cpp
ai/testing/aspect_attacks.cpp
ai/testing/ca.cpp
ai/testing/ca_global_fallback.cpp
ai/testing/ca_testing_move_to_targets.cpp
ai/testing/ca_testing_recruitment.cpp
ai/testing/stage_rca.cpp
ai/testing/stage_fallback.cpp
ai/testing.cpp
ai/testing/stage_rca.cpp
animated_game.cpp
attack_prediction.cpp
attack_prediction_display.cpp
@ -201,90 +201,30 @@ wesnoth_sources = Split("""
config_cache.cpp
controller_base.cpp
dialogs.cpp
editor/action.cpp
editor/brush.cpp
editor/editor_controller.cpp
editor/editor_display.cpp
editor/editor_layout.cpp
editor/editor_main.cpp
editor/editor_map.cpp
editor/editor_palettes.cpp
editor/editor_preferences.cpp
editor/map_context.cpp
editor/map_fragment.cpp
editor/mouse_action.cpp
exceptions.cpp
floating_textbox.cpp
formula.cpp
formula_debugger.cpp
formula_debugger_fwd.cpp
formula_function.cpp
formula_tokenizer.cpp
formula_string_utils.cpp
formula_tokenizer.cpp
game_display.cpp
game_events.cpp
game_preferences.cpp
gamestatus.cpp
halo.cpp
help.cpp
intro.cpp
leader_list.cpp
lobby_preferences.cpp
menu_events.cpp
mouse_events.cpp
mouse_handler_base.cpp
mp_game_settings.cpp
multiplayer.cpp
multiplayer_ui.cpp
multiplayer_wait.cpp
multiplayer_create.cpp
multiplayer_lobby.cpp
multiplayer_connect.cpp
pathfind/pathfind.cpp
pathfind/teleport.cpp
persist_context.cpp
persist_manager.cpp
persist_var.cpp
playcampaign.cpp
play_controller.cpp
playmp_controller.cpp
playsingle_controller.cpp
playturn.cpp
portrait.cpp
replay.cpp
replay_controller.cpp
resources.cpp
save_blocker.cpp
savegame.cpp
savegame_config.cpp
scripting/lua.cpp
sha1.cpp
settings.cpp
side_filter.cpp
statistics.cpp
statistics_dialog.cpp
storyscreen/interface.cpp
storyscreen/controller.cpp
storyscreen/part.cpp
storyscreen/render.cpp
team.cpp
terrain_filter.cpp
tod_manager.cpp
unit.cpp
unit_abilities.cpp
unit_animation.cpp
unit_display.cpp
unit_frame.cpp
unit_helper.cpp
unit_id.cpp
unit_map.cpp
unit_types.cpp
variable.cpp
variant.cpp
whiteboard/action.cpp
whiteboard/attack.cpp
whiteboard/manager.cpp
whiteboard/move.cpp
whiteboard/highlight_visitor.cpp
whiteboard/mapbuilder_visitor.cpp
whiteboard/recall.cpp
whiteboard/recruit.cpp
whiteboard/side_actions.cpp
whiteboard/utility.cpp
whiteboard/validate_visitor.cpp
whiteboard/visitor.cpp
widgets/combo.cpp
widgets/combo_drag.cpp
widgets/drop_target.cpp
widgets/scrollpane.cpp
gui/auxiliary/canvas.cpp
gui/auxiliary/event/dispatcher.cpp
gui/auxiliary/event/distributor.cpp
@ -306,7 +246,6 @@ wesnoth_sources = Split("""
gui/auxiliary/widget_definition/progress_bar.cpp
gui/auxiliary/widget_definition/repeating_button.cpp
gui/auxiliary/widget_definition/scroll_label.cpp
gui/auxiliary/widget_definition/vertical_scrollbar.cpp
gui/auxiliary/widget_definition/scrollbar_panel.cpp
gui/auxiliary/widget_definition/slider.cpp
gui/auxiliary/widget_definition/spacer.cpp
@ -315,10 +254,12 @@ wesnoth_sources = Split("""
gui/auxiliary/widget_definition/toggle_button.cpp
gui/auxiliary/widget_definition/toggle_panel.cpp
gui/auxiliary/widget_definition/tree_view.cpp
gui/auxiliary/widget_definition/vertical_scrollbar.cpp
gui/auxiliary/widget_definition/window.cpp
gui/auxiliary/window_builder.cpp
gui/auxiliary/window_builder/button.cpp
gui/auxiliary/window_builder/drawing.cpp
gui/auxiliary/window_builder/control.cpp
gui/auxiliary/window_builder/drawing.cpp
gui/auxiliary/window_builder/helper.cpp
gui/auxiliary/window_builder/horizontal_listbox.cpp
gui/auxiliary/window_builder/horizontal_scrollbar.cpp
@ -327,6 +268,9 @@ wesnoth_sources = Split("""
gui/auxiliary/window_builder/listbox.cpp
gui/auxiliary/window_builder/minimap.cpp
gui/auxiliary/window_builder/multi_page.cpp
gui/auxiliary/window_builder/panel.cpp
gui/auxiliary/window_builder/password_box.cpp
gui/auxiliary/window_builder/progress_bar.cpp
gui/auxiliary/window_builder/repeating_button.cpp
gui/auxiliary/window_builder/scroll_label.cpp
gui/auxiliary/window_builder/scrollbar_panel.cpp
@ -335,25 +279,25 @@ wesnoth_sources = Split("""
gui/auxiliary/window_builder/stacked_widget.cpp
gui/auxiliary/window_builder/text_box.cpp
gui/auxiliary/window_builder/toggle_button.cpp
gui/auxiliary/window_builder/vertical_scrollbar.cpp
gui/auxiliary/window_builder/panel.cpp
gui/auxiliary/window_builder/progress_bar.cpp
gui/auxiliary/window_builder/password_box.cpp
gui/auxiliary/window_builder/toggle_panel.cpp
gui/auxiliary/window_builder/tree_view.cpp
gui/auxiliary/window_builder.cpp
gui/auxiliary/window_builder/vertical_scrollbar.cpp
gui/dialogs/addon/description.cpp
gui/dialogs/addon_connect.cpp
gui/dialogs/addon_list.cpp
gui/dialogs/addon/description.cpp
gui/dialogs/campaign_difficulty.cpp
gui/dialogs/campaign_selection.cpp
gui/dialogs/data_manage.cpp
gui/dialogs/debug_clock.cpp
gui/dialogs/dialog.cpp
gui/dialogs/edit_label.cpp
gui/dialogs/editor_generate_map.cpp
gui/dialogs/editor_new_map.cpp
gui/dialogs/editor_resize_map.cpp
gui/dialogs/editor_settings.cpp
gui/dialogs/formula_debugger.cpp
gui/dialogs/game_load.cpp
gui/dialogs/game_delete.cpp
gui/dialogs/game_load.cpp
gui/dialogs/game_save.cpp
gui/dialogs/gamestate_inspector.cpp
gui/dialogs/language_selection.cpp
@ -362,23 +306,23 @@ wesnoth_sources = Split("""
gui/dialogs/lobby_main.cpp
gui/dialogs/lobby_player_info.cpp
gui/dialogs/message.cpp
gui/dialogs/mp_cmd_wrapper.cpp
gui/dialogs/mp_connect.cpp
gui/dialogs/mp_create_game.cpp
gui/dialogs/mp_create_game_set_password.cpp
gui/dialogs/mp_method_selection.cpp
gui/dialogs/mp_cmd_wrapper.cpp
gui/dialogs/popup.cpp
gui/dialogs/simple_item_selector.cpp
gui/dialogs/tip.cpp
gui/dialogs/title_screen.cpp
gui/dialogs/transient_message.cpp
gui/dialogs/tip.cpp
gui/dialogs/unit_attack.cpp
gui/dialogs/unit_create.cpp
gui/dialogs/wml_message.cpp
gui/widgets/button.cpp
gui/widgets/drawing.cpp
gui/widgets/control.cpp
gui/widgets/container.cpp
gui/widgets/control.cpp
gui/widgets/drawing.cpp
gui/widgets/generator.cpp
gui/widgets/grid.cpp
gui/widgets/helper.cpp
@ -390,14 +334,14 @@ wesnoth_sources = Split("""
gui/widgets/minimap.cpp
gui/widgets/multi_page.cpp
gui/widgets/panel.cpp
gui/widgets/progress_bar.cpp
gui/widgets/password_box.cpp
gui/widgets/progress_bar.cpp
gui/widgets/repeating_button.cpp
gui/widgets/settings.cpp
gui/widgets/scroll_label.cpp
gui/widgets/scrollbar.cpp
gui/widgets/scrollbar_container.cpp
gui/widgets/scrollbar_panel.cpp
gui/widgets/scrollbar.cpp
gui/widgets/settings.cpp
gui/widgets/slider.cpp
gui/widgets/spacer.cpp
gui/widgets/stacked_widget.cpp
@ -410,32 +354,82 @@ wesnoth_sources = Split("""
gui/widgets/vertical_scrollbar.cpp
gui/widgets/widget.cpp
gui/widgets/window.cpp
halo.cpp
help.cpp
intro.cpp
leader_list.cpp
lobby_preferences.cpp
menu_events.cpp
mouse_events.cpp
mouse_handler_base.cpp
mp_game_settings.cpp
multiplayer.cpp
multiplayer_connect.cpp
multiplayer_create.cpp
multiplayer_lobby.cpp
multiplayer_ui.cpp
multiplayer_wait.cpp
pathfind/pathfind.cpp
pathfind/teleport.cpp
persist_context.cpp
persist_manager.cpp
persist_var.cpp
play_controller.cpp
playcampaign.cpp
playmp_controller.cpp
playsingle_controller.cpp
playturn.cpp
portrait.cpp
replay.cpp
replay_controller.cpp
resources.cpp
save_blocker.cpp
savegame.cpp
savegame_config.cpp
scripting/lua.cpp
settings.cpp
sha1.cpp
side_filter.cpp
statistics.cpp
statistics_dialog.cpp
storyscreen/controller.cpp
storyscreen/interface.cpp
storyscreen/part.cpp
storyscreen/render.cpp
team.cpp
terrain_filter.cpp
tod_manager.cpp
unit.cpp
unit_abilities.cpp
unit_animation.cpp
unit_display.cpp
unit_frame.cpp
unit_helper.cpp
unit_id.cpp
unit_map.cpp
unit_types.cpp
variable.cpp
variant.cpp
whiteboard/action.cpp
whiteboard/attack.cpp
whiteboard/highlight_visitor.cpp
whiteboard/manager.cpp
whiteboard/mapbuilder_visitor.cpp
whiteboard/move.cpp
whiteboard/recall.cpp
whiteboard/recruit.cpp
whiteboard/side_actions.cpp
whiteboard/utility.cpp
whiteboard/validate_visitor.cpp
whiteboard/visitor.cpp
widgets/combo.cpp
widgets/combo_drag.cpp
widgets/drop_target.cpp
widgets/scrollpane.cpp
""")
wesnoth_sources.extend(client_env.Object("game_preferences_display.cpp", EXTRA_DEFINE = env["PLATFORM"] != "win32" and "WESNOTH_PREFIX='\"$prefix\"'" or None))
wesnoth_editor_sources = Split("""
gui/dialogs/editor_generate_map.cpp
gui/dialogs/editor_new_map.cpp
gui/dialogs/editor_resize_map.cpp
gui/dialogs/editor_settings.cpp
editor/action.cpp
editor/brush.cpp
editor/editor_main.cpp
editor/editor_controller.cpp
editor/editor_display.cpp
editor/editor_layout.cpp
editor/editor_map.cpp
editor/editor_palettes.cpp
editor/editor_preferences.cpp
editor/map_context.cpp
editor/map_fragment.cpp
editor/mouse_action.cpp
""")
if env["editor"]:
wesnoth_sources += wesnoth_editor_sources
libwesnoth_extras = client_env.Library("wesnoth_extras", wesnoth_sources)
libwesnoth_extras.extend(SConscript("lua/SConscript"))
@ -519,7 +513,7 @@ test_sources = Split("""
tests/main.cpp
tests/test_formula_ai.cpp
tests/test_formula_function.cpp
tests/test_lexical_cast.cpp
tests/test_lexical_cast.cpp
tests/test_network_worker.cpp
tests/test_team.cpp
tests/test_util.cpp

48
src/game.cpp
View file

@ -18,9 +18,7 @@
#include "SDL.h"
#include "SDL_mixer.h"
#ifndef DISABLE_EDITOR
#include "SDL_getenv.h"
#endif
#include "about.hpp"
#include "ai/configuration.hpp"
@ -87,9 +85,7 @@
//#include "locale.h"
//#endif
#ifndef DISABLE_EDITOR
#include "editor/editor_main.hpp"
#endif
#include "wesconfig.h"
@ -174,9 +170,8 @@ public:
bool new_campaign();
bool goto_campaign();
bool goto_multiplayer();
#ifndef DISABLE_EDITOR
bool goto_editor();
#endif
bool play_multiplayer();
bool change_language();
@ -185,9 +180,9 @@ public:
enum RELOAD_GAME_DATA { RELOAD_DATA, NO_RELOAD_DATA };
void launch_game(RELOAD_GAME_DATA reload=RELOAD_DATA);
void play_replay();
#ifndef DISABLE_EDITOR
editor::EXIT_STATUS start_editor(const std::string& filename = "");
#endif
void start_wesnothd();
const config& game_config() const { return game_config_; }
@ -235,9 +230,9 @@ private:
std::string multiplayer_server_;
bool jump_to_multiplayer_;
jump_to_campaign_info jump_to_campaign_;
#ifndef DISABLE_EDITOR
bool jump_to_editor_;
#endif
game_config::config_cache& cache_;
};
@ -270,9 +265,7 @@ game_controller::game_controller(int argc, char** argv) :
multiplayer_server_(),
jump_to_multiplayer_(false),
jump_to_campaign_(false,-1,"","")
#ifndef DISABLE_EDITOR
,jump_to_editor_(false)
#endif
,cache_(game_config::config_cache::instance())
{
bool no_music = false;
@ -292,10 +285,8 @@ game_controller::game_controller(int argc, char** argv) :
font_manager_.update_font_path();
}
#ifndef DISABLE_EDITOR
const std::string app_basename = file_name(argv[0]);
jump_to_editor_ = app_basename.find("editor") != std::string::npos;
#endif
for(arg_ = 1; arg_ != argc_; ++arg_) {
const std::string val(argv_[arg_]);
@ -354,7 +345,6 @@ game_controller::game_controller(int argc, char** argv) :
no_sound = true;
preferences::disable_preferences_save();
}
#ifndef DISABLE_EDITOR
else if(val == "--screenshot") {
if(arg_+2 != argc_) {
++arg_;
@ -367,7 +357,6 @@ game_controller::game_controller(int argc, char** argv) :
force_bpp_ = 32;
}
}
#endif
else if(val == "--smallgui") {
game_config::small_gui = true;
} else if(val == "--config-dir" || val == "--data-dir") {
@ -500,7 +489,6 @@ game_controller::game_controller(int argc, char** argv) :
gui2::new_widgets = true;
} else if(val == "--clock") {
gui2::show_debug_clock_button = true;
#ifndef DISABLE_EDITOR
} else if(val == "-e" || val == "--editor") {
jump_to_editor_ = true;
if(arg_+1 != argc_) {
@ -509,7 +497,6 @@ game_controller::game_controller(int argc, char** argv) :
game::load_game_exception::game = argv_[arg_];
}
}
#endif
} else if(val[0] == '-') {
std::cerr << "unknown option: " << val << std::endl;
throw config::error("unknown option");
@ -634,16 +621,11 @@ bool game_controller::init_config(const bool force)
if (test_mode_)
cache_.add_define("TEST");
#ifndef DISABLE_EDITOR
if (jump_to_editor_)
cache_.add_define("EDITOR");
if (!multiplayer_mode_ && !test_mode_ && !jump_to_editor_)
cache_.add_define("TITLE_SCREEN");
#else
if (!multiplayer_mode_ && !test_mode_)
cache_.add_define("TITLE_SCREEN");
#endif
load_game_cfg(force);
@ -717,7 +699,6 @@ bool game_controller::play_screenshot_mode()
return true;
}
#ifndef DISABLE_EDITOR
cache_.clear_defines();
cache_.add_define("EDITOR");
load_game_cfg();
@ -726,9 +707,6 @@ bool game_controller::play_screenshot_mode()
editor::start(game_config(), video_, screenshot_map_, true, screenshot_filename_);
return false;
#else
return false;
#endif
}
bool game_controller::play_multiplayer_mode()
@ -1254,7 +1232,6 @@ bool game_controller::goto_multiplayer()
return true;
}
#ifndef DISABLE_EDITOR
bool game_controller::goto_editor()
{
if(jump_to_editor_){
@ -1268,7 +1245,6 @@ bool game_controller::goto_editor()
}
return true;
}
#endif
namespace
{
@ -1676,7 +1652,6 @@ void game_controller::play_replay()
}
}
#ifndef DISABLE_EDITOR
editor::EXIT_STATUS game_controller::start_editor(const std::string& filename)
{
while(true){
@ -1696,7 +1671,6 @@ editor::EXIT_STATUS game_controller::start_editor(const std::string& filename)
}
return editor::EXIT_ERROR; // not supposed to happen
}
#endif
game_controller::~game_controller()
{
@ -1817,10 +1791,8 @@ static int process_command_args(int argc, char** argv) {
<< " The data can also be generated when the F12 is\n"
<< " pressed in a dialog.\n"
#endif
#ifndef DISABLE_EDITOR
<< " -e, --editor [<file>] starts the in-game map editor directly. If <file>\n"
<< " is specified, equivalent to -e --load <file>.\n"
#endif
<< " --fps displays the number of frames per second the\n"
<< " game is currently running at, in a corner of\n"
<< " the screen.\n"
@ -1833,12 +1805,10 @@ static int process_command_args(int argc, char** argv) {
<< " -h, --help prints this message and exits.\n"
<< " -l, --load <file> loads the save <file> from the standard save\n"
<< " game directory.\n"
#ifndef DISABLE_EDITOR
<< " When launching the map editor via -e, the map\n"
<< " <file> is loaded, relative to the current\n"
<< " directory. If it is a directory, the editor\n"
<< " will start with a load map dialog opened there.\n"
#endif
<< " --log-<level>=<domain1>,<domain2>,...\n"
<< " sets the severity level of the log domains.\n"
<< " 'all' can be used to match any log domain.\n"
@ -1925,7 +1895,6 @@ static int process_command_args(int argc, char** argv) {
<< "\n";
return 0;
}
#ifndef DISABLE_EDITOR
else if (val == "--screenshot" ) {
if(!(argc > arg + 2)) {
std::cerr << "format of " << val << " command: " << val << " <map file> <output file>\n";
@ -1934,7 +1903,6 @@ static int process_command_args(int argc, char** argv) {
static char opt[] = "SDL_VIDEODRIVER=dummy";
SDL_putenv(opt);
}
#endif
else if(val == "--config-dir") {
if (argc <= ++arg)
break;
@ -2337,11 +2305,11 @@ static int do_gameloop(int argc, char** argv)
if(game.goto_multiplayer() == false){
continue; //Go to main menu
}
#ifndef DISABLE_EDITOR
if (game.goto_editor() == false) {
return 0;
}
#endif
loadscreen_manager.reset();
gui2::ttitle_screen::tresult res = game.is_loading()
@ -2414,14 +2382,12 @@ static int do_gameloop(int argc, char** argv)
game.reload_changed_game_config();
image::flush_cache();
continue;
#ifndef DISABLE_EDITOR
} else if(res == gui2::ttitle_screen::START_MAP_EDITOR) {
///@todo editor can ask the game to quit completely
if (game.start_editor() == editor::EXIT_QUIT_TO_DESKTOP) {
return 0;
}
continue;
#endif
}
if (recorder.at_end()){

2
src/gui/dialogs/title_screen.cpp
View file

@ -240,13 +240,11 @@ void ttitle_screen::post_build(CVideo& video, twindow& window)
, boost::ref(window)
, GET_ADDONS));
#ifndef DISABLE_EDITOR
window.register_hotkey(hotkey::TITLE_SCREEN__EDITOR
, boost::bind(
&hotkey
, boost::ref(window)
, START_MAP_EDITOR));
#endif
window.register_hotkey(hotkey::TITLE_SCREEN__CREDITS
, boost::bind(

2
src/gui/dialogs/title_screen.hpp
View file

@ -43,9 +43,7 @@ public:
*/
, LOAD_GAME
, GET_ADDONS
#ifndef DISABLE_EDITOR
, START_MAP_EDITOR
#endif
, CHANGE_LANGUAGE
, EDIT_PREFERENCES
, SHOW_ABOUT /**< Show credits */

2
src/gui/widgets/window.cpp
View file

@ -459,10 +459,8 @@ twindow::tretval twindow::get_retval_by_id(const std::string& id)
*/
} else if(id == "tutorial") {
return static_cast<tretval>(ttitle_screen::TUTORIAL);
#ifndef DISABLE_EDITOR
} else if(id == "editor") {
return static_cast<tretval>(ttitle_screen::START_MAP_EDITOR);
#endif
} else if(id == "credits") {
return static_cast<tretval>(ttitle_screen::SHOW_ABOUT);
} else if(id == "quit") {

4
src/hotkeys.cpp
View file

@ -114,7 +114,6 @@ const struct {
{ hotkey::HOTKEY_WB_BUMP_UP_ACTION, "wbbumpupaction", N_("Move action up queue"), false, hotkey::SCOPE_GAME },
{ hotkey::HOTKEY_WB_BUMP_DOWN_ACTION, "wbbumpdownaction", N_("Move action down queue"), false, hotkey::SCOPE_GAME },
#ifndef DISABLE_EDITOR
{ hotkey::HOTKEY_EDITOR_QUIT_TO_DESKTOP, "editor-quit-to-desktop", N_("Quit to Desktop"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_CLOSE_MAP, "editor-close-map", N_("Close Map"), false, hotkey::SCOPE_EDITOR },
{ hotkey::HOTKEY_EDITOR_SWITCH_MAP, "editor-switch-map", N_("Switch Map"), false, hotkey::SCOPE_EDITOR },
@ -189,7 +188,6 @@ const struct {
N_("Draw Terrain Codes"), false, hotkey::SCOPE_EDITOR },
#endif
{ hotkey::HOTKEY_DELAY_SHROUD, "delayshroud", N_("Delay Shroud Updates"), false, hotkey::SCOPE_GAME },
{ hotkey::HOTKEY_UPDATE_SHROUD, "updateshroud", N_("Update Shroud Now"), false, hotkey::SCOPE_GAME },
@ -254,7 +252,6 @@ const struct {
, false
, hotkey::SCOPE_GENERAL
},
#ifndef DISABLE_EDITOR
{
hotkey::TITLE_SCREEN__EDITOR
, "title_screen__editor"
@ -262,7 +259,6 @@ const struct {
, false
, hotkey::SCOPE_GENERAL
},
#endif
{
hotkey::TITLE_SCREEN__CREDITS
, "title_screen__credits"

4
src/hotkeys.hpp
View file

@ -68,7 +68,6 @@ enum HOTKEY_COMMAND {
HOTKEY_WB_BUMP_UP_ACTION,
HOTKEY_WB_BUMP_DOWN_ACTION,
#ifndef DISABLE_EDITOR
HOTKEY_EDITOR_QUIT_TO_DESKTOP,
HOTKEY_EDITOR_CLOSE_MAP, HOTKEY_EDITOR_SWITCH_MAP,
HOTKEY_EDITOR_SETTINGS,
@ -96,7 +95,6 @@ enum HOTKEY_COMMAND {
HOTKEY_EDITOR_AUTO_UPDATE_TRANSITIONS,
HOTKEY_EDITOR_REFRESH_IMAGE_CACHE,
HOTKEY_EDITOR_DRAW_COORDINATES, HOTKEY_EDITOR_DRAW_TERRAIN_CODES,
#endif
//misc.
HOTKEY_USER_CMD,
@ -111,9 +109,7 @@ enum HOTKEY_COMMAND {
TITLE_SCREEN__CAMPAIGN,
TITLE_SCREEN__MULTIPLAYER,
TITLE_SCREEN__ADDONS,
#ifndef DISABLE_EDITOR
TITLE_SCREEN__EDITOR,
#endif
TITLE_SCREEN__CREDITS,
GLOBAL__HELPTIP,
HOTKEY_NULL

2
src/reports.cpp
View file

@ -799,7 +799,6 @@ REPORT_GENERATOR(observers)
return image_report(game_config::images::observer, str.str());
}
#ifndef DISABLE_EDITOR
namespace editor {
extern std::string selected_terrain, left_button_function;
}
@ -819,7 +818,6 @@ REPORT_GENERATOR(edit_left_button_function)
else
return text_report(editor::left_button_function);
}
#endif
REPORT_GENERATOR(editor_tool_hint)
{

6
src/tests/gui/test_gui2.cpp
View file

@ -28,12 +28,10 @@
#include "gui/dialogs/addon_connect.hpp"
#include "gui/dialogs/addon_list.hpp"
#include "gui/dialogs/campaign_selection.hpp"
#ifndef DISABLE_EDITOR
#include "gui/dialogs/editor_generate_map.hpp"
#include "gui/dialogs/editor_new_map.hpp"
#include "gui/dialogs/editor_resize_map.hpp"
#include "gui/dialogs/editor_settings.hpp"
#endif
#include "gui/dialogs/game_save.hpp"
#include "gui/dialogs/language_selection.hpp"
#include "gui/dialogs/message.hpp"
@ -158,9 +156,7 @@ BOOST_AUTO_TEST_CASE(test_gui2)
game_config::config_cache& cache = game_config::config_cache::instance();
cache.clear_defines();
#ifndef DISABLE_EDITOR
cache.add_define("EDITOR");
#endif
cache.add_define("MULTIPLAYER");
cache.get_config(game_config::path +"/data", main_config);
@ -173,12 +169,10 @@ BOOST_AUTO_TEST_CASE(test_gui2)
test<gui2::taddon_connect>();
test<gui2::taddon_list>();
test<gui2::tcampaign_selection>();
#ifndef DISABLE_EDITOR
test<gui2::teditor_generate_map>();
test<gui2::teditor_new_map>();
test<gui2::teditor_resize_map>();
test<gui2::teditor_settings>();
#endif
test<gui2::tgame_save>();
test<gui2::tlanguage_selection>();
test<gui2::tmessage>();