bugfixes, new config system and messed code for it

[libpicofe.git] / gp2x / main.c

diff --git a/gp2x/main.c b/gp2x/main.c
index 4d8317e..f016411 100644 (file)
--- a/gp2x/main.c
+++ b/gp2x/main.c
@@ -11,6 +11,9 @@
 \r
 #include "gp2x.h"\r
 #include "menu.h"\r
+#include "../common/menu.h"\r
+#include "../common/emu.h"\r
+#include "../common/config.h"\r
 #include "emu.h"\r
 #include "940ctl.h"\r
 #include "version.h"\r
@@ -79,7 +82,10 @@ int main(int argc, char *argv[])
 {\r
        g_argv = argv;\r
 \r
-       emu_ReadConfig(0);\r
+       emu_prepareDefaultConfig();\r
+       emu_ReadConfig(0, 0);\r
+       config_readlrom(PicoConfigFile);\r
+\r
        gp2x_init();\r
        if (currentConfig.EmuOpt&0x10) {\r
                int ret = mmuhack();\r
@@ -97,6 +103,7 @@ int main(int argc, char *argv[])
        }\r
        sharedmem_init();\r
        emu_Init();\r
+       menu_init();\r
 \r
        engineState = PGS_Menu;\r
 \r