aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Bacca2002-03-14 22:45:22 +0000
committerNicolas Bacca2002-03-14 22:45:22 +0000
commit2a3fb540aca09c092d158ed8bdd3ab801859b0dc (patch)
tree19acf9c61d30040699e8346bada1ba79fad6f144
parent5ebbbd8c8fee3ec513cadf1fa474fb158f4b64db (diff)
downloadscummvm-rg350-2a3fb540aca09c092d158ed8bdd3ab801859b0dc.tar.gz
scummvm-rg350-2a3fb540aca09c092d158ed8bdd3ab801859b0dc.tar.bz2
scummvm-rg350-2a3fb540aca09c092d158ed8bdd3ab801859b0dc.zip
Minor changes to compile WinCE port
svn-id: r3758
-rw-r--r--scumm.h2
-rw-r--r--scummvm.cpp5
-rw-r--r--stdafx.h8
3 files changed, 15 insertions, 0 deletions
diff --git a/scumm.h b/scumm.h
index 88fc48cb93..581e89fbe8 100644
--- a/scumm.h
+++ b/scumm.h
@@ -2281,6 +2281,8 @@ struct Serializer {
bool isSaving() { return _saveOrLoad; }
+ bool Serializer::checkEOFLoadStream();
+
};
extern const uint32 IMxx_tags[];
diff --git a/scummvm.cpp b/scummvm.cpp
index 0a657378e7..021bff95f0 100644
--- a/scummvm.cpp
+++ b/scummvm.cpp
@@ -285,8 +285,13 @@ void Scumm::scummMain(int argc, char **argv) {
}
int Scumm::scummLoop(int delta) {
+
+#ifndef _WIN32_WCE
+
if (_debugger)
_debugger->on_frame();
+
+#endif
_vars[VAR_TMR_1] += delta;
_vars[VAR_TMR_2] += delta;
diff --git a/stdafx.h b/stdafx.h
index 28a15a62df..08db9cc821 100644
--- a/stdafx.h
+++ b/stdafx.h
@@ -2,6 +2,9 @@
* $Id$
*
* $Log$
+ * Revision 1.12 2002/03/14 22:45:22 arisme
+ * Minor changes to compile WinCE port
+ *
* Revision 1.11 2002/03/09 13:48:53 drigo
* Support for MacOS classic port
*
@@ -36,6 +39,8 @@
#pragma once
#endif // _MSC_VER > 1000
+#if !defined(_WIN32_WCE)
+
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#define NOGDICAPMASKS
#define OEMRESOURCE
@@ -60,6 +65,8 @@
#define NOSOUND
#define NODRAWTEXT
+#endif
+
#include <SDL.h>
#include <windows.h>
#include <stdio.h>
@@ -73,6 +80,7 @@
#include <assert.h>
#include <mmsystem.h>
#include <ctype.h>
+#include <Winuser.h>
#else