aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoost Peters2006-04-16 13:26:10 +0000
committerJoost Peters2006-04-16 13:26:10 +0000
commit1baf98f1c85a8e95cba74d947c9ff1657ee80e68 (patch)
treec0420f06f29341c5de9b342e4aecda5c2cee0037
parent6c076f80d7a214fb20f24e4054c7c32a39049168 (diff)
downloadscummvm-rg350-1baf98f1c85a8e95cba74d947c9ff1657ee80e68.tar.gz
scummvm-rg350-1baf98f1c85a8e95cba74d947c9ff1657ee80e68.tar.bz2
scummvm-rg350-1baf98f1c85a8e95cba74d947c9ff1657ee80e68.zip
update so it compiles again with current svn
svn-id: r21941
-rw-r--r--backends/psp/psp_main.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/backends/psp/psp_main.cpp b/backends/psp/psp_main.cpp
index f06ac5f1d5..15580bebd6 100644
--- a/backends/psp/psp_main.cpp
+++ b/backends/psp/psp_main.cpp
@@ -29,13 +29,12 @@
#include <string.h>
#include <common/stdafx.h>
-#include <common/scummsys.h>
+#include <common/system.h>
#include <base/engine.h>
#include <base/main.h>
-#include <base/gameDetector.h>
#include <base/plugins.h>
-#include <pspgu.h>
+#include "osys_psp_gu.h"
#include "./trace.h"
@@ -122,7 +121,7 @@ int SetupCallbacks(void)
return thid;
}
-
+#undef main
int main(void)
{
//PSPDebugTrace("Init debug screen\n");
@@ -144,7 +143,7 @@ int main(void)
static char *argv[] = { "scummvm", "--force-1x-overlay", NULL };
static int argc = sizeof(argv)/sizeof(char *)-1;
- g_system = OSystem_PSP_create();
+ g_system = new OSystem_PSP_GU();
assert(g_system);
int res = scummvm_main(argc, argv);