diff options
| author | Ruediger Hanke | 2002-08-22 10:43:50 +0000 |
|---|---|---|
| committer | Ruediger Hanke | 2002-08-22 10:43:50 +0000 |
| commit | 31f6833f87da3af3c480d0b6e605c3565efef1d0 (patch) | |
| tree | 18530341c2b5ed81fb767ec424add41a32c94039 /common | |
| parent | e0cfd49ef794cff5641dbca71ff3fa70c35fc738 (diff) | |
| download | scummvm-rg350-31f6833f87da3af3c480d0b6e605c3565efef1d0.tar.gz scummvm-rg350-31f6833f87da3af3c480d0b6e605c3565efef1d0.tar.bz2 scummvm-rg350-31f6833f87da3af3c480d0b6e605c3565efef1d0.zip | |
Made MorphOS port use master makefile, few compilation fixes
svn-id: r4800
Diffstat (limited to 'common')
| -rw-r--r-- | common/timer.cpp | 3 | ||||
| -rw-r--r-- | common/timer.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/common/timer.cpp b/common/timer.cpp index 2a3fc74024..7ca8f4c1a2 100644 --- a/common/timer.cpp +++ b/common/timer.cpp @@ -23,6 +23,7 @@ #include "scummsys.h" #include "timer.h" +#ifndef __MORPHOS__ static Scumm * scumm; Timer::Timer(Scumm * parent) { @@ -153,5 +154,5 @@ void Timer::releaseProcedure (TimerProc procedure) { } _timerRunning = true; } - +#endif diff --git a/common/timer.h b/common/timer.h index a4f4c7080d..789714cb7a 100644 --- a/common/timer.h +++ b/common/timer.h @@ -28,7 +28,7 @@ typedef void (*TimerProc)(Scumm *); #ifdef __MORPHOS__ -#include "morphos/morphos_timer.h" +#include "morphos_timer.h" #else class OSystem; |