diff options
| author | Johannes Schickel | 2015-12-08 21:43:34 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2015-12-08 21:43:34 +0100 |
| commit | 33be7ef5dd1be112f24b56fc1ff1bf4fabc190ed (patch) | |
| tree | de4e5d5b31ac1f60e8315cf1441143418b290f76 /backends/platform/sdl/posix | |
| parent | 457640a16257be20581080d6d682994cca94ba37 (diff) | |
| parent | ae1be06db831e9480a060ef513aad6819be5cdd0 (diff) | |
| download | scummvm-rg350-33be7ef5dd1be112f24b56fc1ff1bf4fabc190ed.tar.gz scummvm-rg350-33be7ef5dd1be112f24b56fc1ff1bf4fabc190ed.tar.bz2 scummvm-rg350-33be7ef5dd1be112f24b56fc1ff1bf4fabc190ed.zip | |
Merge branch 'rpi-sdl2'
This is a manual merge of pull request #632. The history fo the PR has been
cleaned up.
Diffstat (limited to 'backends/platform/sdl/posix')
| -rw-r--r-- | backends/platform/sdl/posix/posix-main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/backends/platform/sdl/posix/posix-main.cpp b/backends/platform/sdl/posix/posix-main.cpp index 492da70eeb..d07db11b0c 100644 --- a/backends/platform/sdl/posix/posix-main.cpp +++ b/backends/platform/sdl/posix/posix-main.cpp @@ -22,7 +22,7 @@ #include "common/scummsys.h" -#if defined(POSIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(MAEMO) && !defined(WEBOS) && !defined(LINUXMOTO) && !defined(GPH_DEVICE) && !defined(GP2X) && !defined(DINGUX) && !defined(OPENPANDORA) && !defined(PLAYSTATION3) && !defined(DISPMANX) +#if defined(POSIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(MAEMO) && !defined(WEBOS) && !defined(LINUXMOTO) && !defined(GPH_DEVICE) && !defined(GP2X) && !defined(DINGUX) && !defined(OPENPANDORA) && !defined(PLAYSTATION3) #include "backends/platform/sdl/posix/posix.h" #include "backends/plugins/sdl/sdl-provider.h" |