[Commits] [wesnoth/wesnoth] f564ba: Merge pull request #311 from gfgtdf/gettext_reorde...

[GitHub]

  Branch: refs/heads/1.12
  Home:   https://github.com/wesnoth/wesnoth
  Commit: f564bab0b91dc6c42d931ed35124ce9ae3471a62
      https://github.com/wesnoth/wesnoth/commit/f564bab0b91dc6c42d931ed35124ce9ae3471a62
  Author: gfgtdf <tischpapier at gmail.com>
  Date:   2014-10-26 (Sun, 26 Oct 2014)

  Changed paths:
    M src/about.cpp
    M src/addon/manager_ui.cpp
    M src/editor/map/context_manager.cpp
    M src/format_time_summary.cpp
    M src/formula_string_utils.cpp
    M src/game.cpp
    M src/game_controller.cpp
    M src/game_preferences_display.cpp
    M src/generators/mapgen_dialog.cpp
    M src/gettext.cpp
    M src/gettext.hpp
    A src/gettext_boost.cpp
    M src/gui/dialogs/addon/description.cpp
    M src/help.cpp
    M src/hotkey/hotkey_preferences_display.cpp
    M src/image.cpp
    M src/language.cpp
    M src/loadscreen.cpp
    M src/menu_events.cpp
    M src/reports.cpp
    M src/savegame.cpp
    M src/strftime.cpp
    M src/strftime.hpp
    M src/tests/utils/game_config_manager.cpp
    M src/tstring.cpp
    M src/unit_types.cpp
    M src/unit_types.hpp

  Log Message:
  -----------
  Merge pull request #311 from gfgtdf/gettext_reorder

new boost gettext implementation that can handle utf8 paths on windows.
Conflicts:
	src/about.cpp
	src/game.cpp
	src/help.cpp
	src/hotkey/hotkey_preferences_display.cpp
	src/language.cpp
	src/save_index.cpp
	src/unit_types.cpp
	src/unit_types.hpp


  Commit: 433798acb18c8e2ac5ad2bb0dae8cf8aaca947cb
      https://github.com/wesnoth/wesnoth/commit/433798acb18c8e2ac5ad2bb0dae8cf8aaca947cb
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-26 (Sun, 26 Oct 2014)

  Changed paths:
    M .travis.yml
    M CMakeLists.txt
    M SConstruct
    M src/CMakeLists.txt
    M src/SConscript
    M src/gettext_boost.cpp
    M src/language.cpp

  Log Message:
  -----------
  Fixup boost filesystem options for cmake, scons

The option should control the compilation, in wesnoth-core, of
filesystem_boost.cpp, and gettext_boost.cpp, vs. the old versions.

Using the new code is now the default option, you must explicitly
deactivate with both cmake and scons to get the old stuff back.

Conflicts:
	CMakeLists.txt
	SConstruct

Also I squash in this commit, adding boost locale to travis:
48217f8da0a0ddf8a00fa4e93346ae467612fef4


  Commit: f33f8bb3edeca295828e6f7958faf10b106a7f34
      https://github.com/wesnoth/wesnoth/commit/f33f8bb3edeca295828e6f7958faf10b106a7f34
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-26 (Sun, 26 Oct 2014)

  Changed paths:
    M CMakeLists.txt
    M src/CMakeLists.txt

  Log Message:
  -----------
  in cmake, make PANDORA option force the BFS option to false

Conflicts:
	CMakeLists.txt

I also fix up earlier backport of this content,

cef5e2ed9ca9fcec93ae0a5f8fdf1c9fe49efb58

so that when pandora overrides BFS setting, the SDL mixer
requirement is relaxed appropriately.


  Commit: bcb89aa0c79820110d345321726779542ddf2856
      https://github.com/wesnoth/wesnoth/commit/bcb89aa0c79820110d345321726779542ddf2856
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-26 (Sun, 26 Oct 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  fixup travis


  Commit: c5dd249072dc364a1368b807ab89db00521c544f
      https://github.com/wesnoth/wesnoth/commit/c5dd249072dc364a1368b807ab89db00521c544f
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-26 (Sun, 26 Oct 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  travis: get g++ from the same repo where we get boost


  Commit: cb43bb4e3fef6f3c0c235f0b571b0f58a159342b
      https://github.com/wesnoth/wesnoth/commit/cb43bb4e3fef6f3c0c235f0b571b0f58a159342b
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-26 (Sun, 26 Oct 2014)

  Changed paths:
    M .travis.yml
    M CMakeLists.txt
    M SConstruct
    M src/CMakeLists.txt
    M src/SConscript
    M src/about.cpp
    M src/addon/manager_ui.cpp
    M src/editor/map/context_manager.cpp
    M src/format_time_summary.cpp
    M src/formula_string_utils.cpp
    M src/game.cpp
    M src/game_controller.cpp
    M src/game_preferences_display.cpp
    M src/generators/mapgen_dialog.cpp
    M src/gettext.cpp
    M src/gettext.hpp
    A src/gettext_boost.cpp
    M src/gui/dialogs/addon/description.cpp
    M src/help.cpp
    M src/hotkey/hotkey_preferences_display.cpp
    M src/image.cpp
    M src/language.cpp
    M src/loadscreen.cpp
    M src/menu_events.cpp
    M src/reports.cpp
    M src/savegame.cpp
    M src/strftime.cpp
    M src/strftime.hpp
    M src/tests/utils/game_config_manager.cpp
    M src/tstring.cpp
    M src/unit_types.cpp
    M src/unit_types.hpp

  Log Message:
  -----------
  Merge branch 'backport_reorder_gettext' into 1.12


Compare: https://github.com/wesnoth/wesnoth/compare/975b2acb0b63...cb43bb4e3fef