[wesnoth-commits] [wesnoth/wesnoth] 49f673: Fix building with Xcode 10 by renaming image, vers...

GitHub noreply at github.com
Sun Aug 12 15:39:40 UTC 2018


  Branch: refs/heads/1.14
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 49f6736798842c4613e2ab8a7c7c1dfafa734422
      https://github.com/wesnoth/wesnoth/commit/49f6736798842c4613e2ab8a7c7c1dfafa734422
  Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
  Date:   2018-08-11 (Sat, 11 Aug 2018)

  Changed paths:
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M src/addon/info.cpp
    M src/addon/info.hpp
    M src/addon/manager.cpp
    M src/campaign_server/campaign_server.cpp
    M src/config.cpp
    M src/config_cache.cpp
    M src/cursor.cpp
    M src/deprecation.cpp
    M src/desktop/apple_version.mm
    M src/display.hpp
    M src/editor/controller/editor_controller.cpp
    M src/editor/palette/tristate_button.cpp
    M src/filesystem_boost.cpp
    M src/game_config.cpp
    M src/game_config_manager.cpp
    M src/game_initialization/configure_engine.cpp
    M src/game_initialization/lobby_data.cpp
    M src/game_initialization/multiplayer.cpp
    M src/game_launcher.hpp
    A src/game_version.cpp
    A src/game_version.hpp
    M src/gui/auxiliary/old_markup.cpp
    M src/gui/core/canvas.cpp
    M src/gui/dialogs/addon/manager.cpp
    M src/gui/dialogs/advanced_graphics_options.cpp
    M src/gui/dialogs/game_load.cpp
    M src/gui/dialogs/multiplayer/mp_create_game.cpp
    M src/gui/dialogs/screenshot_notification.cpp
    M src/gui/dialogs/terrain_layers.cpp
    M src/gui/widgets/image.cpp
    M src/help/help_impl.cpp
    M src/help/help_text_area.cpp
    R src/image.cpp
    R src/image.hpp
    M src/image_modifications.cpp
    A src/map_settings.cpp
    A src/map_settings.hpp
    M src/minimap.cpp
    M src/mp_game_settings.hpp
    A src/picture.cpp
    A src/picture.hpp
    M src/preferences/game.cpp
    M src/savegame.cpp
    M src/scripting/lua_kernel_base.cpp
    M src/sdl/utils.hpp
    M src/serialization/preprocessor.cpp
    M src/serialization/preprocessor.hpp
    M src/server/server.cpp
    M src/server/server_base.cpp
    R src/settings.cpp
    R src/settings.hpp
    M src/show_dialog.cpp
    M src/storyscreen/parser.cpp
    M src/terrain/builder.cpp
    M src/tests/test_config_cache.cpp
    M src/tests/test_image_modifications.cpp
    M src/tests/test_recall_list.cpp
    M src/tests/test_sdl_utils.cpp
    M src/tests/test_unit_map.cpp
    M src/tests/test_version.cpp
    R src/tests/utils/game_config_manager.cpp
    R src/tests/utils/game_config_manager.hpp
    A src/tests/utils/game_config_manager_tests.cpp
    A src/tests/utils/game_config_manager_tests.hpp
    M src/units/frame.hpp
    M src/units/unit.cpp
    R src/version.cpp
    R src/version.hpp
    M src/video.cpp
    M src/wesnoth.cpp
    M src/widgets/button.cpp
    M src/widgets/menu.cpp
    M src/widgets/menu_style.cpp
    M src/widgets/scrollbar.cpp

  Log Message:
  -----------
  Fix building with Xcode 10 by renaming image, version and settings in root of src


  Commit: ac43a2d3ed9b855f932278a6f88cab1cffae20e1
      https://github.com/wesnoth/wesnoth/commit/ac43a2d3ed9b855f932278a6f88cab1cffae20e1
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2018-08-11 (Sat, 11 Aug 2018)

  Changed paths:
    M projectfiles/VC12/wesnoth.vcxproj
    M projectfiles/VC12/wesnoth.vcxproj.filters
    M projectfiles/VC12/wesnothlib.vcxproj
    M projectfiles/VC12/wesnothlib.vcxproj.filters

  Log Message:
  -----------
  Update Visual Studio project


  Commit: 734acb4082cca47ec1d7cd23ca3ad4fe79aa7bd2
      https://github.com/wesnoth/wesnoth/commit/734acb4082cca47ec1d7cd23ca3ad4fe79aa7bd2
  Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
  Date:   2018-08-12 (Sun, 12 Aug 2018)

  Changed paths:
    M projectfiles/CodeBlocks-SCons/wesnoth.cbp
    M projectfiles/CodeBlocks-SCons/wesnothd.cbp
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/CodeBlocks/wesnothd.cbp
    M source_lists/boost_unit_tests
    M source_lists/libwesnoth
    M source_lists/libwesnoth_core
    M source_lists/wesnoth

  Log Message:
  -----------
  Fix CodeBlocks and Scons builds


  Commit: 43aa192ace0c5678db604c9c7f5e03c991f4d323
      https://github.com/wesnoth/wesnoth/commit/43aa192ace0c5678db604c9c7f5e03c991f4d323
  Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
  Date:   2018-08-12 (Sun, 12 Aug 2018)

  Changed paths:
    M src/video.cpp

  Log Message:
  -----------
  Include SDL_WINDOW_ALLOW_HIGHDPI flag


  Commit: eb4a09d331cf40f0e6edf69a00c22f0206268673
      https://github.com/wesnoth/wesnoth/commit/eb4a09d331cf40f0e6edf69a00c22f0206268673
  Author: Martin Hrubý (hrubymar10) <hrubymar10 at gmail.com>
  Date:   2018-08-12 (Sun, 12 Aug 2018)

  Changed paths:
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M src/video.cpp

  Log Message:
  -----------
  Fix indentation and force using tabs in Xcode project


  Commit: 543d35447f06539f0e486c569dba503709d5a5d0
      https://github.com/wesnoth/wesnoth/commit/543d35447f06539f0e486c569dba503709d5a5d0
  Author: Celtic Minstrel <CelticMinstrel at users.noreply.github.com>
  Date:   2018-08-12 (Sun, 12 Aug 2018)

  Changed paths:
    M projectfiles/CodeBlocks-SCons/wesnoth.cbp
    M projectfiles/CodeBlocks-SCons/wesnothd.cbp
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/CodeBlocks/wesnothd.cbp
    M projectfiles/VC12/wesnoth.vcxproj
    M projectfiles/VC12/wesnoth.vcxproj.filters
    M projectfiles/VC12/wesnothlib.vcxproj
    M projectfiles/VC12/wesnothlib.vcxproj.filters
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M source_lists/boost_unit_tests
    M source_lists/libwesnoth
    M source_lists/libwesnoth_core
    M source_lists/wesnoth
    M src/addon/info.cpp
    M src/addon/info.hpp
    M src/addon/manager.cpp
    M src/campaign_server/campaign_server.cpp
    M src/config.cpp
    M src/config_cache.cpp
    M src/cursor.cpp
    M src/deprecation.cpp
    M src/desktop/apple_version.mm
    M src/display.hpp
    M src/editor/controller/editor_controller.cpp
    M src/editor/palette/tristate_button.cpp
    M src/filesystem_boost.cpp
    M src/game_config.cpp
    M src/game_config_manager.cpp
    M src/game_initialization/configure_engine.cpp
    M src/game_initialization/lobby_data.cpp
    M src/game_initialization/multiplayer.cpp
    M src/game_launcher.hpp
    A src/game_version.cpp
    A src/game_version.hpp
    M src/gui/auxiliary/old_markup.cpp
    M src/gui/core/canvas.cpp
    M src/gui/dialogs/addon/manager.cpp
    M src/gui/dialogs/advanced_graphics_options.cpp
    M src/gui/dialogs/game_load.cpp
    M src/gui/dialogs/multiplayer/mp_create_game.cpp
    M src/gui/dialogs/screenshot_notification.cpp
    M src/gui/dialogs/terrain_layers.cpp
    M src/gui/widgets/image.cpp
    M src/help/help_impl.cpp
    M src/help/help_text_area.cpp
    R src/image.cpp
    R src/image.hpp
    M src/image_modifications.cpp
    A src/map_settings.cpp
    A src/map_settings.hpp
    M src/minimap.cpp
    M src/mp_game_settings.hpp
    A src/picture.cpp
    A src/picture.hpp
    M src/preferences/game.cpp
    M src/savegame.cpp
    M src/scripting/lua_kernel_base.cpp
    M src/sdl/utils.hpp
    M src/serialization/preprocessor.cpp
    M src/serialization/preprocessor.hpp
    M src/server/server.cpp
    M src/server/server_base.cpp
    R src/settings.cpp
    R src/settings.hpp
    M src/show_dialog.cpp
    M src/storyscreen/parser.cpp
    M src/terrain/builder.cpp
    M src/tests/test_config_cache.cpp
    M src/tests/test_image_modifications.cpp
    M src/tests/test_recall_list.cpp
    M src/tests/test_sdl_utils.cpp
    M src/tests/test_unit_map.cpp
    M src/tests/test_version.cpp
    R src/tests/utils/game_config_manager.cpp
    R src/tests/utils/game_config_manager.hpp
    A src/tests/utils/game_config_manager_tests.cpp
    A src/tests/utils/game_config_manager_tests.hpp
    M src/units/frame.hpp
    M src/units/unit.cpp
    R src/version.cpp
    R src/version.hpp
    M src/video.cpp
    M src/wesnoth.cpp
    M src/widgets/button.cpp
    M src/widgets/menu.cpp
    M src/widgets/menu_style.cpp
    M src/widgets/scrollbar.cpp

  Log Message:
  -----------
  Merge pull request #3451 from wesnoth/Fix_Wesnoth_for_Xcode_10

Fix building with Xcode 10


Compare: https://github.com/wesnoth/wesnoth/compare/717a43c49004...543d35447f06
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.


More information about the Commits mailing list