WIN32: Add experimental SDL2 support.

Based on changes by aquadran.
This commit is contained in:
Johannes Schickel 2015-02-16 02:13:11 +01:00
parent 3f22c12c56
commit 3745ddbefd
7 changed files with 44 additions and 11 deletions

View file

@ -28,6 +28,8 @@
#include "icons/scummvm.xpm"
#include <SDL_syswm.h>
SdlWindow::SdlWindow()
#if SDL_VERSION_ATLEAST(2, 0, 0)
: _window(nullptr), _inputGrabState(false), _windowCaption("ScummVM"), _windowIcon(nullptr)
@ -171,6 +173,15 @@ void SdlWindow::iconifyWindow() {
#endif
}
bool SdlWindow::getSDLWMInformation(SDL_SysWMinfo *info) const {
SDL_VERSION(&info->version);
#if SDL_VERSION_ATLEAST(2, 0, 0)
return SDL_GetWindowWMInfo(_window, info);
#else
return SDL_GetWMInfo(info);
#endif
}
#if SDL_VERSION_ATLEAST(2, 0, 0)
SDL_Surface *copySDLSurface(SDL_Surface *src) {
const bool locked = SDL_MUSTLOCK(src) == SDL_TRUE;