[colobot] 13/377: Merge pull request #651 from colobot/dev-sdl2

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit cf1f589af06d3357879f373668ceab169f50a886
Merge: 1440190 377a331
Author: krzys_h <krzys_h at interia.pl>
Date:   Sat Sep 26 21:01:41 2015 +0200

    Merge pull request #651 from colobot/dev-sdl2
    
    SDL2 migration

 CMakeLists.txt                              |  21 +-
 INSTALL-MXE.md                              |  34 +-
 INSTALL.md                                  |   8 +-
 README.md                                   |   2 +-
 cmake/FindSDL2.cmake                        | 163 ++++++++
 cmake/FindSDL2_image.cmake                  | 158 +++++++
 cmake/FindSDL2_ttf.cmake                    | 157 +++++++
 cmake/mxe.cmake                             |  16 +-
 lib/clipboard/.gitignore                    |   1 -
 lib/clipboard/CMakeLists.txt                |  18 -
 lib/clipboard/COPYING.README                |  72 ----
 lib/clipboard/include/clipboard/clipboard.h |  55 ---
 lib/clipboard/include/clipboard/types.h     | 100 -----
 lib/clipboard/include/clipboard/utf.h       | 115 ------
 lib/clipboard/include/clipboard/wzglobal.h  | 614 ----------------------------
 lib/clipboard/readme.txt                    |   1 -
 lib/clipboard/src/clipboardOSX.m            |  24 --
 lib/clipboard/src/clipboardWin32.c          | 160 --------
 lib/clipboard/src/clipboardX11.c            | 293 -------------
 lib/clipboard/src/utf.c                     | 530 ------------------------
 src/CMakeLists.txt                          |  18 +-
 src/app/app.cpp                             | 333 ++++++---------
 src/app/app.h                               |  34 +-
 src/app/input.cpp                           |  40 +-
 src/common/event.cpp                        |   9 +-
 src/common/event.h                          |  83 ++--
 src/common/image.cpp                        |   1 -
 src/common/key.cpp                          |   4 +-
 src/common/key.h                            |   7 +-
 src/common/resources/sdl_file_wrapper.cpp   |  15 +-
 src/common/resources/sdl_file_wrapper.h     |   7 +-
 src/common/restext.cpp                      |  18 +-
 src/common/thread/resource_owning_thread.h  |   8 +-
 src/graphics/engine/camera.cpp              |  55 +--
 src/graphics/engine/camera.h                |   2 +-
 src/graphics/engine/engine.cpp              |  58 +--
 src/graphics/engine/engine.h                |   5 +-
 src/graphics/engine/text.cpp                |  16 +-
 src/graphics/engine/text.h                  |   5 +-
 src/graphics/opengl/gl21device.cpp          |  17 +-
 src/graphics/opengl/gl33device.cpp          |  17 +-
 src/graphics/opengl/gldevice.cpp            |  17 +-
 src/level/robotmain.cpp                     |  17 +-
 src/level/robotmain.h                       |   3 +-
 src/ui/controls/edit.cpp                    |  46 ++-
 src/ui/controls/edit.h                      |   2 +
 src/ui/controls/editvalue.cpp               |  13 +-
 src/ui/controls/key.cpp                     |   3 +-
 src/ui/controls/list.cpp                    |  16 +-
 src/ui/controls/scroll.cpp                  |  30 +-
 src/ui/controls/slider.cpp                  |  30 +-
 src/ui/screen/screen_setup_display.cpp      |   6 +-
 52 files changed, 941 insertions(+), 2536 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git