[Commits] [wesnoth/wesnoth] 5c6e7c: Remove SDL1 from SCons and CMake

Sat Mar 12 23:36:42 UTC 2016

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 5c6e7c7d2000c024ddf9adc19a369a7672b63095
      https://github.com/wesnoth/wesnoth/commit/5c6e7c7d2000c024ddf9adc19a369a7672b63095
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2016-03-13 (Sun, 13 Mar 2016)

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

  Log Message:
  -----------
  Remove SDL1 from SCons and CMake

This makes SDL2 the only build alternative for Wesnoth. Any
conditionals are removed, leaving only the settings that rely on SDL2.

  Commit: 358bd1235f07d8d577bdb2bb0b4aafcff2e93093
      https://github.com/wesnoth/wesnoth/commit/358bd1235f07d8d577bdb2bb0b4aafcff2e93093
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2016-03-13 (Sun, 13 Mar 2016)

  Changed paths:
    M projectfiles/Xcode/Mac Sources/SDLMain.m
    M src/SDL_gpu/SDL_gpu/SDL_gpu.h
    M src/about.cpp
    M src/attack_prediction_display.cpp
    M src/build_info.cpp
    M src/controller_base.cpp
    M src/controller_base.hpp
    M src/cursor.cpp
    M src/cursor.hpp
    M src/desktop/clipboard.cpp
    M src/desktop/notifications.cpp
    M src/desktop/windows_tray_notification.cpp
    M src/display.cpp
    M src/display.hpp
    M src/editor/map/context_manager.cpp
    M src/editor/palette/palette_manager.cpp
    M src/events.cpp
    M src/events.hpp
    M src/filesystem_common.cpp
    M src/floating_label.cpp
    M src/floating_label.hpp
    M src/game_initialization/multiplayer_ui.cpp
    M src/game_launcher.cpp
    M src/gui/auxiliary/event/distributor.hpp
    M src/gui/auxiliary/event/handler.cpp
    M src/gui/dialogs/lobby_main.cpp
    M src/gui/dialogs/title_screen.cpp
    M src/gui/widgets/grid.cpp
    M src/gui/widgets/window.cpp
    M src/hotkey/command_executor.hpp
    M src/hotkey/hotkey_item.cpp
    M src/hotkey/hotkey_item.hpp
    M src/hotkey/hotkey_preferences_display.cpp
    M src/image.cpp
    M src/image_modifications.cpp
    M src/joystick.cpp
    M src/key.cpp
    M src/loadscreen.cpp
    M src/lua/luaconf.h
    M src/map_label.cpp
    M src/mouse_handler_base.cpp
    M src/mouse_handler_base.hpp
    M src/preferences.cpp
    M src/sdl/alpha.cpp
    M src/sdl/alpha.hpp
    M src/sdl/compat.hpp
    M src/sdl/keyboard.cpp
    M src/sdl/keyboard.hpp
    M src/sdl/rect.hpp
    M src/sdl/utils.cpp
    M src/sdl/utils.hpp
    M src/sdl/window.cpp
    M src/sdl/window.hpp
    M src/show_dialog.cpp
    M src/show_dialog.hpp
    M src/storyscreen/render.cpp
    M src/storyscreen/render.hpp
    M src/tests/gui/test_save_dialog.cpp
    M src/tests/test_image_modifications.cpp
    M src/tests/utils/fake_event_source.cpp
    M src/tests/utils/fake_event_source.hpp
    M src/tests/utils/play_scenario.cpp
    M src/tests/utils/play_scenario.hpp
    M src/text.cpp
    M src/text.hpp
    M src/thread.cpp
    M src/video.cpp
    M src/video.hpp
    M src/wesnoth.cpp
    M src/widgets/scrollarea.cpp
    M src/widgets/scrollbar.cpp
    M src/widgets/slider.cpp
    M src/widgets/slider.hpp
    M src/widgets/textbox.cpp
    M src/widgets/textbox.hpp
    M src/widgets/widget.cpp
    M src/widgets/widget.hpp

  Log Message:
  -----------
  Remove SDL1.2 code

This removes all legacy SDL1.2 code. It was done by invoking:
coan source --replace --no-transients -D"SDL_VERSION_ATLEAST(X, Y, Z)"=1 <file>
on each file.

  Commit: 1d56fbb384b705d7209ff08aaa90df800eb11ba0
      https://github.com/wesnoth/wesnoth/commit/1d56fbb384b705d7209ff08aaa90df800eb11ba0
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2016-03-13 (Sun, 13 Mar 2016)

  Changed paths:
    M projectfiles/VC9/wesnoth.vcproj
    M src/CMakeLists.txt
    M src/SConscript
    R src/sdl/keyboard.cpp
    R src/sdl/keyboard.hpp

  Log Message:
  -----------
  Remove superfluous keyboard files

These files were used to provide a compatability layer between SDL1.2
and SDL2 for the hotkeys implementation. As SDL1.2 was taken out,
these files were now empty and superfluous.

  Commit: 8da954b4a095b7035aa62e701c8eb9541a1a29dd
      https://github.com/wesnoth/wesnoth/commit/8da954b4a095b7035aa62e701c8eb9541a1a29dd
  Author: Andreas <andreas at alternating.net>
  Date:   2016-03-13 (Sun, 13 Mar 2016)

  Changed paths:
    M CMakeLists.txt
    M SConstruct
    M projectfiles/VC9/wesnoth.vcproj
    M projectfiles/Xcode/Mac Sources/SDLMain.m
    M src/CMakeLists.txt
    M src/SConscript
    M src/SDL_gpu/SDL_gpu/SDL_gpu.h
    M src/about.cpp
    M src/attack_prediction_display.cpp
    M src/build_info.cpp
    M src/controller_base.cpp
    M src/controller_base.hpp
    M src/cursor.cpp
    M src/cursor.hpp
    M src/desktop/clipboard.cpp
    M src/desktop/notifications.cpp
    M src/desktop/windows_tray_notification.cpp
    M src/display.cpp
    M src/display.hpp
    M src/editor/map/context_manager.cpp
    M src/editor/palette/palette_manager.cpp
    M src/events.cpp
    M src/events.hpp
    M src/filesystem_common.cpp
    M src/floating_label.cpp
    M src/floating_label.hpp
    M src/game_initialization/multiplayer_ui.cpp
    M src/game_launcher.cpp
    M src/gui/auxiliary/event/distributor.hpp
    M src/gui/auxiliary/event/handler.cpp
    M src/gui/dialogs/lobby_main.cpp
    M src/gui/dialogs/title_screen.cpp
    M src/gui/widgets/grid.cpp
    M src/gui/widgets/window.cpp
    M src/hotkey/command_executor.hpp
    M src/hotkey/hotkey_item.cpp
    M src/hotkey/hotkey_item.hpp
    M src/hotkey/hotkey_preferences_display.cpp
    M src/image.cpp
    M src/image_modifications.cpp
    M src/joystick.cpp
    M src/key.cpp
    M src/loadscreen.cpp
    M src/lua/luaconf.h
    M src/map_label.cpp
    M src/mouse_handler_base.cpp
    M src/mouse_handler_base.hpp
    M src/preferences.cpp
    M src/sdl/alpha.cpp
    M src/sdl/alpha.hpp
    M src/sdl/compat.hpp
    R src/sdl/keyboard.cpp
    R src/sdl/keyboard.hpp
    M src/sdl/rect.hpp
    M src/sdl/utils.cpp
    M src/sdl/utils.hpp
    M src/sdl/window.cpp
    M src/sdl/window.hpp
    M src/show_dialog.cpp
    M src/show_dialog.hpp
    M src/storyscreen/render.cpp
    M src/storyscreen/render.hpp
    M src/tests/gui/test_save_dialog.cpp
    M src/tests/test_image_modifications.cpp
    M src/tests/utils/fake_event_source.cpp
    M src/tests/utils/fake_event_source.hpp
    M src/tests/utils/play_scenario.cpp
    M src/tests/utils/play_scenario.hpp
    M src/text.cpp
    M src/text.hpp
    M src/thread.cpp
    M src/video.cpp
    M src/video.hpp
    M src/wesnoth.cpp
    M src/widgets/scrollarea.cpp
    M src/widgets/scrollbar.cpp
    M src/widgets/slider.cpp
    M src/widgets/slider.hpp
    M src/widgets/textbox.cpp
    M src/widgets/textbox.hpp
    M src/widgets/widget.cpp
    M src/widgets/widget.hpp

  Log Message:
  -----------
  Merge pull request #627 from aginor/remove_sdl_1.2

Remove SDL 1.2 support from Wesnoth

Compare: https://github.com/wesnoth/wesnoth/compare/127921496808...8da954b4a095