[wesnoth-commits] [wesnoth/wesnoth] 247098: Prepend 'SDL2/' to all SDL includes

Charles Dang noreply at github.com
Mon Jul 22 04:36:58 UTC 2019


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 2470984af3fbb679c9f225045d5c9f955ba4c64c
      https://github.com/wesnoth/wesnoth/commit/2470984af3fbb679c9f225045d5c9f955ba4c64c
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2019-07-22 (Mon, 22 Jul 2019)

  Changed paths:
    M src/ai/default/ca.cpp
    M src/ai/manager.cpp
    M src/animated.cpp
    M src/build_info.cpp
    M src/config_cache.cpp
    M src/countdown_clock.hpp
    M src/desktop/clipboard.cpp
    M src/desktop/windows_tray_notification.cpp
    M src/desktop/windows_tray_notification.hpp
    M src/display.cpp
    M src/display_chat_manager.cpp
    M src/events.cpp
    M src/events.hpp
    M src/filesystem.cpp
    M src/filesystem_sdl.cpp
    M src/font/font_id.hpp
    M src/font/marked-up_text.hpp
    M src/font/sdl_ttf.cpp
    M src/font/sdl_ttf.hpp
    M src/font/text_surface.cpp
    M src/font/text_surface.hpp
    M src/game_launcher.cpp
    M src/game_state.cpp
    M src/generators/default_map_generator_job.cpp
    M src/gui/core/event/dispatcher.hpp
    M src/gui/core/event/dispatcher_private.hpp
    M src/gui/core/timer.cpp
    M src/gui/core/timer.hpp
    M src/gui/dialogs/end_credits.hpp
    M src/gui/dialogs/game_load.hpp
    M src/gui/dialogs/hotkey_bind.cpp
    M src/gui/dialogs/hotkey_bind.hpp
    M src/gui/dialogs/tooltip.hpp
    M src/gui/widgets/helper.cpp
    M src/help/help.cpp
    M src/help/help_browser.cpp
    M src/help/help_browser.hpp
    M src/help/help_impl.cpp
    M src/help/help_impl.hpp
    M src/help/help_menu.cpp
    M src/help/help_topic_generators.cpp
    M src/hotkey/command_executor.cpp
    M src/hotkey/hotkey_item.cpp
    M src/hotkey/hotkey_item.hpp
    M src/joystick.hpp
    M src/key.hpp
    M src/map/label.hpp
    M src/mouse_events.cpp
    M src/mouse_events.hpp
    M src/mouse_handler_base.hpp
    M src/picture.cpp
    M src/picture.hpp
    M src/save_blocker.hpp
    M src/scripting/application_lua_kernel.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/sdl/exception.cpp
    M src/sdl/point.hpp
    M src/sdl/rect.hpp
    M src/sdl/surface.hpp
    M src/sdl/userevent.hpp
    M src/sdl/utils.hpp
    M src/sdl/window.cpp
    M src/sdl/window.hpp
    M src/sound.cpp
    M src/soundsource.cpp
    M src/tests/main.cpp
    M src/theme.hpp
    M src/tooltips.cpp
    M src/wesnoth.cpp
    M src/wesnothd_connection.cpp

  Log Message:
  -----------
  Prepend 'SDL2/' to all SDL includes

This was needed to get the build working with vcpkg's version of SDL, where all the SDL files are
in their own SDL folder. However, our cmake config also has a note saying it was a deliberate choice
to move our SDL files *out* of their SDL2 folder due to certain distros (FreeBSD is mentioned) not
putting the files in said folder in the first place.





More information about the Commits mailing list