notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some work on PSP CLUT
[picodrive.git]
/
platform
/
gp2x
/
main.c
diff --git
a/platform/gp2x/main.c
b/platform/gp2x/main.c
index
4d8317e
..
95e0e9f
100644
(file)
--- a/
platform/gp2x/main.c
+++ b/
platform/gp2x/main.c
@@
-11,6
+11,8
@@
\r
#include "gp2x.h"
\r
#include "menu.h"
\r
\r
#include "gp2x.h"
\r
#include "menu.h"
\r
+#include "../common/menu.h"
\r
+#include "../common/emu.h"
\r
#include "emu.h"
\r
#include "940ctl.h"
\r
#include "version.h"
\r
#include "emu.h"
\r
#include "940ctl.h"
\r
#include "version.h"
\r
@@
-79,7
+81,7
@@
int main(int argc, char *argv[])
{
\r
g_argv = argv;
\r
\r
{
\r
g_argv = argv;
\r
\r
- emu_ReadConfig(0);
\r
+ emu_ReadConfig(0
, 0
);
\r
gp2x_init();
\r
if (currentConfig.EmuOpt&0x10) {
\r
int ret = mmuhack();
\r
gp2x_init();
\r
if (currentConfig.EmuOpt&0x10) {
\r
int ret = mmuhack();
\r
@@
-97,6
+99,7
@@
int main(int argc, char *argv[])
}
\r
sharedmem_init();
\r
emu_Init();
\r
}
\r
sharedmem_init();
\r
emu_Init();
\r
+ menu_init();
\r
\r
engineState = PGS_Menu;
\r
\r
\r
engineState = PGS_Menu;
\r
\r