diff options
author | Andre Heider | 2010-09-05 15:26:00 +0000 |
---|---|---|
committer | Andre Heider | 2010-09-05 15:26:00 +0000 |
commit | 09834b8bec5fdaf24719988376debf8671518846 (patch) | |
tree | fd25fc6b22f8935d4ccd30c122c972106b6ca52a /backends/platform/sdl/sdl.cpp | |
parent | 402c71860f0a6f254604b1fbd1a763d470c859c0 (diff) | |
parent | 13e24af0cace8599d31c8bb7381fa9fce49a8e6e (diff) | |
download | scummvm-rg350-09834b8bec5fdaf24719988376debf8671518846.tar.gz scummvm-rg350-09834b8bec5fdaf24719988376debf8671518846.tar.bz2 scummvm-rg350-09834b8bec5fdaf24719988376debf8671518846.zip |
MERGE: Merge trunk to branch.
svn-id: r52564
Diffstat (limited to 'backends/platform/sdl/sdl.cpp')
-rw-r--r-- | backends/platform/sdl/sdl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index 6686249416..22fc561b0f 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -150,7 +150,7 @@ void OSystem_SDL::initBackend() { memset(&_videoMode, 0, sizeof(_videoMode)); memset(&_transactionDetails, 0, sizeof(_transactionDetails)); -#if !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) && defined(USE_SCALERS) +#if !defined(_WIN32_WCE) && !defined(DINGUX) && !defined(__SYMBIAN32__) && defined(USE_SCALERS) _videoMode.mode = GFX_DOUBLESIZE; _videoMode.scaleFactor = 2; _videoMode.aspectRatioCorrection = ConfMan.getBool("aspect_ratio"); |