[Scummvm-cvs-logs] CVS: scummvm main.cpp,1.4,1.5 scummsys.h,1.27,1.28 scummvm.cpp,1.109,1.110 system.h,1.6,1.7

[Ruediger Hanke]

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

Modified Files:
	main.cpp scummsys.h scummvm.cpp system.h 
Log Message:
Updating MorphOS port to compile with current CVS state

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/main.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** main.cpp	14 Apr 2002 18:13:07 -0000	1.4
--- main.cpp	14 Apr 2002 19:43:11 -0000	1.5
***************
*** 12,16 ****
  
  
! #if !defined(__APPLE__)
  #undef main
  #endif
--- 12,16 ----
  
  
! #if !defined(__APPLE__) && !defined(__MORPHOS__)
  #undef main
  #endif

Index: scummsys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummsys.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** scummsys.h	13 Apr 2002 20:12:43 -0000	1.27
--- scummsys.h	14 Apr 2002 19:43:11 -0000	1.28
***************
*** 199,202 ****
--- 199,203 ----
  	#define NORETURN
  #endif
+ #define main morphos_main
  #elif defined(__DC__)
  

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** scummvm.cpp	14 Apr 2002 18:13:07 -0000	1.109
--- scummvm.cpp	14 Apr 2002 19:43:11 -0000	1.110
***************
*** 1125,1129 ****
--- 1125,1131 ----
  				mouse.y = event.mouse.y;
  				_system->set_mouse_pos(event.mouse.x, event.mouse.y);
+ #if !defined(__MORPHOS__)
  				_system->update_screen();
+ #endif
  				break;
  

Index: system.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/system.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** system.h	14 Apr 2002 18:13:07 -0000	1.6
--- system.h	14 Apr 2002 19:43:11 -0000	1.7
***************
*** 107,110 ****
--- 107,111 ----
  OSystem *OSystem_SDL_create(int gfx_driver, bool full_screen);
  OSystem *OSystem_NULL_create();
+ OSystem *OSystem_MorphOS_create(int game_id, int gfx_driver, bool full_screen);
  
  enum {