aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/sdl
diff options
context:
space:
mode:
authorKostas Nakos2006-11-12 11:47:43 +0000
committerKostas Nakos2006-11-12 11:47:43 +0000
commitcc42cb83093c71f966b61abba894e5a5fe33ae42 (patch)
treeea6bb77ec74668dfc9d35c6930e8f34d6f3b87bf /backends/platform/sdl
parentfb795dabd04392fe87a24da6bb5fb28ab4fc6c2c (diff)
downloadscummvm-rg350-cc42cb83093c71f966b61abba894e5a5fe33ae42.tar.gz
scummvm-rg350-cc42cb83093c71f966b61abba894e5a5fe33ae42.tar.bz2
scummvm-rg350-cc42cb83093c71f966b61abba894e5a5fe33ae42.zip
Implement Fingolfin's modular backend timer, savefile and mixer managers
svn-id: r24691
Diffstat (limited to 'backends/platform/sdl')
-rw-r--r--backends/platform/sdl/sdl.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index d9bf951cf9..1835f70f25 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -37,7 +37,14 @@
#include "SymbianOs.h"
#endif
-#if !defined(_WIN32_WCE) && !defined(__MAEMO__)
+#ifndef __MAEMO__
+
+static Uint32 timer_handler(Uint32 interval, void *param) {
+ ((DefaultTimerManager *)param)->handler();
+ return interval;
+}
+
+#ifndef _WIN32_WCE
#if defined (WIN32)
int __stdcall WinMain(HINSTANCE /*hInst*/, HINSTANCE /*hPrevInst*/, LPSTR /*lpCmdLine*/, int /*iShowCmd*/) {
@@ -46,11 +53,6 @@ int __stdcall WinMain(HINSTANCE /*hInst*/, HINSTANCE /*hPrevInst*/, LPSTR /*lpC
}
#endif
-static Uint32 timer_handler(Uint32 interval, void *param) {
- ((DefaultTimerManager *)param)->handler();
- return interval;
-}
-
int main(int argc, char *argv[]) {
#if defined(__SYMBIAN32__)
@@ -114,7 +116,8 @@ int main(int argc, char *argv[]) {
g_system->quit(); // TODO: Consider removing / replacing this!
return res;
}
-#endif
+#endif // defined(_WIN32_WCE)
+#endif // defined(__MAEMO__)
void OSystem_SDL::initBackend() {
assert(!_inited);