diff options
| author | Yotam Barnoy | 2010-10-31 11:08:43 +0000 |
|---|---|---|
| committer | Yotam Barnoy | 2010-10-31 11:08:43 +0000 |
| commit | 94c8d0a14df429a1b25bd9f5c5d75497fd0ddbd1 (patch) | |
| tree | 3df2a4ae7967c56d464729669fc06ce4e93dff36 /backends/platform/sdl/main.cpp | |
| parent | 8df4278ba8cfbf71228e1927f9db635a9a30a57f (diff) | |
| parent | dca3c8d8bfc6c4db38cf8e8291818dd472041d4e (diff) | |
| download | scummvm-rg350-94c8d0a14df429a1b25bd9f5c5d75497fd0ddbd1.tar.gz scummvm-rg350-94c8d0a14df429a1b25bd9f5c5d75497fd0ddbd1.tar.bz2 scummvm-rg350-94c8d0a14df429a1b25bd9f5c5d75497fd0ddbd1.zip | |
Updated with latest from trunk
svn-id: r53976
Diffstat (limited to 'backends/platform/sdl/main.cpp')
| -rw-r--r-- | backends/platform/sdl/main.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/backends/platform/sdl/main.cpp b/backends/platform/sdl/main.cpp index 9d116d325a..a9e1f5cf4b 100644 --- a/backends/platform/sdl/main.cpp +++ b/backends/platform/sdl/main.cpp @@ -23,6 +23,8 @@ * */ +#define FORBIDDEN_SYMBOL_ALLOW_ALL + // Fix for bug #2895217 "MSVC compilation broken with r47595": // We need to keep this on top of the "common/scummsys.h" include, // otherwise we will get errors about the windows headers redefining @@ -38,7 +40,7 @@ // Several SDL based ports use a custom main, and hence do not want to compile // of this file. The following "#if" ensures that. -#if !defined(__MAEMO__) && !defined(_WIN32_WCE) && !defined(GP2XWIZ)&& !defined(LINUXMOTO) && !defined(__SYMBIAN32__) && !defined(DINGUX) +#if !defined(__MAEMO__) && !defined(__SYMBIAN32__) && !defined(_WIN32_WCE) && !defined(DINGUX) && !defined(GPH_DEVICE) && !defined(LINUXMOTO) && !defined(OPENPANDORA) #include "backends/platform/sdl/sdl.h" |