[Scummvm-cvs-logs] CVS: scummvm stdafx.h,1.11,1.12 scummvm.cpp,1.81,1.82 scumm.h,1.83,1.84

[Nicolas Bacca]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv19271

Modified Files:
	stdafx.h scummvm.cpp scumm.h 
Log Message:
Minor changes to compile WinCE port

Index: stdafx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/stdafx.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** stdafx.h	9 Mar 2002 13:48:53 -0000	1.11
--- stdafx.h	14 Mar 2002 22:45:22 -0000	1.12
***************
*** 3,6 ****
--- 3,9 ----
   *
   * $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,39 ****
--- 39,44 ----
  #pragma once
  #endif // _MSC_VER > 1000
+ 
+ #if !defined(_WIN32_WCE)
  
  #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
***************
*** 60,63 ****
--- 65,70 ----
  #define NOSOUND
  #define NODRAWTEXT
+ 
+ #endif
  
  #include <SDL.h>
***************
*** 74,77 ****
--- 81,85 ----
  #include <mmsystem.h>
  #include <ctype.h>
+ #include <Winuser.h>
  
  #else

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** scummvm.cpp	14 Mar 2002 16:49:59 -0000	1.81
--- scummvm.cpp	14 Mar 2002 22:45:22 -0000	1.82
***************
*** 285,291 ****
  }
  
! int Scumm::scummLoop(int delta) {
  	if (_debugger)
! 		_debugger->on_frame();
  	
  	_vars[VAR_TMR_1] += delta;
--- 285,296 ----
  }
  
! int Scumm::scummLoop(int delta) {
! 
! #ifndef _WIN32_WCE
! 
  	if (_debugger)
! 		_debugger->on_frame();
! 
! #endif
  	
  	_vars[VAR_TMR_1] += delta;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** scumm.h	14 Mar 2002 16:49:59 -0000	1.83
--- scumm.h	14 Mar 2002 22:45:22 -0000	1.84
***************
*** 2280,2284 ****
  	uint32 loadUint32();
  
! 	bool isSaving() { return _saveOrLoad; }
  
  };
--- 2280,2286 ----
  	uint32 loadUint32();
  
! 	bool isSaving() { return _saveOrLoad; }
! 
! 	bool Serializer::checkEOFLoadStream();
  
  };