[Scummvm-git-logs] scummvm master -> 215c98d32122bc0fb391841efe7238ae13ca09f8

ccawley2011 ccawley2011 at gmail.com
Sun Aug 2 22:03:34 UTC 2020


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
215c98d321 MAEMO: Fix compilation with older SDL versions


Commit: 215c98d32122bc0fb391841efe7238ae13ca09f8
    https://github.com/scummvm/scummvm/commit/215c98d32122bc0fb391841efe7238ae13ca09f8
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-08-02T23:03:30+01:00

Commit Message:
MAEMO: Fix compilation with older SDL versions

Changed paths:
    backends/platform/sdl/sdl-window.cpp


diff --git a/backends/platform/sdl/sdl-window.cpp b/backends/platform/sdl/sdl-window.cpp
index 8f7a63ccee..485ad162f3 100644
--- a/backends/platform/sdl/sdl-window.cpp
+++ b/backends/platform/sdl/sdl-window.cpp
@@ -39,13 +39,19 @@ SdlWindow::SdlWindow()
 #endif
 	{
 
-#if !SDL_VERSION_ATLEAST(2, 0, 0)
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+#elif SDL_VERSION_ATLEAST(1, 2, 13)
 	// Query the desktop resolution. We simply hope nothing tried to change
 	// the resolution so far.
 	const SDL_VideoInfo *videoInfo = SDL_GetVideoInfo();
 	if (videoInfo && videoInfo->current_w > 0 && videoInfo->current_h > 0) {
 		_desktopRes = Common::Rect(videoInfo->current_w, videoInfo->current_h);
 	}
+#elif defined(MAEMO)
+	// All supported Maemo devices have a display resolution of 800x480
+	_desktopRes = Common::Rect(800, 480);
+#else
+#error Unable to detect screen resolution
 #endif
 }
 




More information about the Scummvm-git-logs mailing list