[Scummvm-cvs-logs] CVS: scummvm-new/common timer.cpp,1.1.1.1,1.2 timer.h,1.1.1.1,1.2

[Ruediger Hanke]

Update of /cvsroot/scummvm/scummvm-new/common
In directory usw-pr-cvs1:/tmp/cvs-serv1067/common

Modified Files:
	timer.cpp timer.h 
Log Message:
Made MorphOS port use master makefile, few compilation fixes

Index: timer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/common/timer.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- timer.cpp	21 Aug 2002 16:07:23 -0000	1.1.1.1
+++ timer.cpp	22 Aug 2002 10:43:50 -0000	1.2
@@ -23,6 +23,7 @@
 #include "scummsys.h"
 #include "timer.h"
 
+#ifndef __MORPHOS__
 static Scumm * scumm;
 
 Timer::Timer(Scumm * parent) {
@@ -153,5 +154,5 @@
 	}
 	_timerRunning = true;
 }
-
+#endif
 

Index: timer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/common/timer.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- timer.h	21 Aug 2002 16:07:23 -0000	1.1.1.1
+++ timer.h	22 Aug 2002 10:43:50 -0000	1.2
@@ -28,7 +28,7 @@
 typedef void (*TimerProc)(Scumm *);
 
 #ifdef __MORPHOS__
-#include "morphos/morphos_timer.h"
+#include "morphos_timer.h"
 #else
 
 class OSystem;