diff options
| author | Yotam Barnoy | 2010-05-24 03:05:17 +0000 |
|---|---|---|
| committer | Yotam Barnoy | 2010-05-24 03:05:17 +0000 |
| commit | 50847c02a6ca526a01f3eecae024e32973413a90 (patch) | |
| tree | f2e1602e6ee22ca6125d894bcff483f156669ca5 | |
| parent | 8f14c15b1afc51a860d7fae28a59cbcd4d7d4d04 (diff) | |
| download | scummvm-rg350-50847c02a6ca526a01f3eecae024e32973413a90.tar.gz scummvm-rg350-50847c02a6ca526a01f3eecae024e32973413a90.tar.bz2 scummvm-rg350-50847c02a6ca526a01f3eecae024e32973413a90.zip | |
PSP: moved timer thread to backends/timer/psp
svn-id: r49173
| -rw-r--r-- | backends/module.mk | 1 | ||||
| -rw-r--r-- | backends/platform/psp/Makefile | 3 | ||||
| -rw-r--r-- | backends/platform/psp/module.mk | 3 | ||||
| -rw-r--r-- | backends/platform/psp/osys_psp.h | 2 | ||||
| -rw-r--r-- | backends/timer/psp/timer.cpp (renamed from backends/platform/psp/timer.cpp) | 5 | ||||
| -rw-r--r-- | backends/timer/psp/timer.h (renamed from backends/platform/psp/timer.h) | 0 |
6 files changed, 8 insertions, 6 deletions
diff --git a/backends/module.mk b/backends/module.mk index 257ae0db9c..59df56b468 100644 --- a/backends/module.mk +++ b/backends/module.mk @@ -40,6 +40,7 @@ MODULE_OBJS := \ saves/posix/posix-saves.o \ saves/psp/psp-saves.o \ timer/default/default-timer.o \ + timer/psp/timer.o \ vkeybd/image-map.o \ vkeybd/polygon.o \ vkeybd/virtual-keyboard.o \ diff --git a/backends/platform/psp/Makefile b/backends/platform/psp/Makefile index 6acd8e970a..6967973da7 100644 --- a/backends/platform/psp/Makefile +++ b/backends/platform/psp/Makefile @@ -148,8 +148,7 @@ OBJS := powerman.o \ trace.o \ psploader.o \ pspkeyboard.o \ - audio.o \ - timer.o + audio.o # Include common Scummvm makefile include $(srcdir)/Makefile.common diff --git a/backends/platform/psp/module.mk b/backends/platform/psp/module.mk index 461df629bf..0e5bd8737d 100644 --- a/backends/platform/psp/module.mk +++ b/backends/platform/psp/module.mk @@ -13,8 +13,7 @@ MODULE_OBJS := powerman.o \ trace.o \ psploader.o \ pspkeyboard.o \ - audio.o \ - timer.o + audio.o MODULE_DIRS += \ backends/platform/psp/ diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h index 413de0f528..3f075d0139 100644 --- a/backends/platform/psp/osys_psp.h +++ b/backends/platform/psp/osys_psp.h @@ -39,7 +39,7 @@ #include "backends/platform/psp/display_manager.h" #include "backends/platform/psp/input.h" #include "backends/platform/psp/audio.h" -#include "backends/platform/psp/timer.h" +#include "backends/timer/psp/timer.h" #include <SDL.h> diff --git a/backends/platform/psp/timer.cpp b/backends/timer/psp/timer.cpp index a35bd9d827..55b63ba4fd 100644 --- a/backends/platform/psp/timer.cpp +++ b/backends/timer/psp/timer.cpp @@ -23,12 +23,13 @@ * */ +#if defined (__PSP__) #include <pspthreadman.h> #include "common/scummsys.h" #include "common/timer.h" #include "backends/platform/psp/thread.h" -#include "backends/platform/psp/timer.h" +#include "backends/timer/psp/timer.h" //#define __PSP_DEBUG_FUNCS__ /* For debugging function calls */ //#define __PSP_DEBUG_PRINT__ /* For debug printouts */ @@ -78,3 +79,5 @@ void PspTimer::timerThread() { _callback(); } }; + +#endif /* __PSP__ */ diff --git a/backends/platform/psp/timer.h b/backends/timer/psp/timer.h index ec31addb72..ec31addb72 100644 --- a/backends/platform/psp/timer.h +++ b/backends/timer/psp/timer.h |