[Commits] [wesnoth/wesnoth] 5e2af0: Fix build

GitHub noreply at github.com
Sun Oct 16 15:35:30 UTC 2016


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 5e2af01fbadbed8a0182a5fe9bd3b23ef95317c3
      https://github.com/wesnoth/wesnoth/commit/5e2af01fbadbed8a0182a5fe9bd3b23ef95317c3
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2016-10-16 (Sun, 16 Oct 2016)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/actions/move.cpp
    M src/addon/manager_ui.cpp
    M src/attack_prediction_display.cpp
    M src/construct_dialog.cpp
    M src/display.cpp
    M src/display.hpp
    M src/editor/action/mouse/mouse_action_map_label.cpp
    M src/editor/palette/editor_palettes.cpp
    M src/editor/palette/location_palette.cpp
    M src/editor/palette/tristate_button.cpp
    M src/floating_label.cpp
    M src/floating_textbox.cpp
    M src/font/constants.cpp
    M src/font/constants.hpp
    M src/font/marked-up_text.cpp
    A src/font/standard_colors.cpp
    A src/font/standard_colors.hpp
    M src/game_display.cpp
    M src/game_initialization/mp_options.cpp
    M src/game_initialization/multiplayer_configure.cpp
    M src/game_initialization/multiplayer_connect.cpp
    M src/game_initialization/multiplayer_create.cpp
    M src/game_initialization/multiplayer_lobby.cpp
    M src/game_initialization/multiplayer_ui.cpp
    M src/game_initialization/multiplayer_wait.cpp
    M src/help/help_impl.cpp
    M src/help/help_text_area.hpp
    M src/hotkey/hotkey_handler.cpp
    M src/hotkey/hotkey_handler_sp.cpp
    M src/hotkey/hotkey_preferences_display.cpp
    M src/map/label.hpp
    M src/menu_events.cpp
    M src/reports.cpp
    M src/server/server.cpp
    M src/show_dialog.cpp
    M src/synced_commands.cpp
    M src/synced_user_choice.cpp
    M src/tooltips.cpp
    M src/whiteboard/move.cpp
    M src/widgets/button.cpp
    M src/widgets/label.hpp
    M src/widgets/menu.cpp
    M src/widgets/slider.cpp
    M src/widgets/textbox.hpp

  Log Message:
  -----------
  Fix build

This involves splitting standard colors out of font/constants.cpp.
Serialization/string_utils.cpp, that is part of wesnothlib
(compiled into both client and server) uses ellipsis and Unicode minus sign
from font constants, which means that font/constants.cpp must be part of
wesnothlib as well. However, one of standard colors is evaluated by calling
inverse(const SDL_Color&) declared in sdl/utils.hpp. Sdl/utils.cpp has way
too many dependencies to live in wesnothlib.

Hence, standard colors are now in a file of their own:
font/standard_colors.cpp. That file is part of wesnoth (not wesnothlib) and
only available for the client.





More information about the Commits mailing list