X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fmain.c;h=ed2191c8cfb715b5980b60ce30f0cf4cd94391fc;hb=b846453101c070b93938dd2224f0cca130a55e8c;hp=4d8317e832d87af87c5173481129fadaf8334914;hpb=9e68ce27d43539d2699b00102d62cec9fa7c0c5b;p=libpicofe.git

diff --git a/gp2x/main.c b/gp2x/main.c
index 4d8317e..ed2191c 100644
--- a/gp2x/main.c
+++ b/gp2x/main.c
@@ -11,6 +11,9 @@
 
 #include "gp2x.h"
 #include "menu.h"
+#include "../common/menu.h"
+#include "../common/emu.h"
+#include "../common/config.h"
 #include "emu.h"
 #include "940ctl.h"
 #include "version.h"
@@ -63,7 +66,7 @@ void parse_cmd_line(int argc, char *argv[])
 	}
 
 	if (unrecognized) {
-		printf("\n\n\nPicoDrive v" VERSION " (c) notaz, 2006-2007\n");
+		printf("\n\n\nPicoDrive v" VERSION " (c) notaz, 2006-2008\n");
 		printf("usage: %s [options] [romfile]\n", argv[0]);
 		printf( "options:\n"
 				"-menu <menu_path> launch a custom program on exit instead of default gp2xmenu\n"
@@ -79,7 +82,10 @@ int main(int argc, char *argv[])
 {
 	g_argv = argv;
 
-	emu_ReadConfig(0);
+	emu_prepareDefaultConfig();
+	emu_ReadConfig(0, 0);
+	config_readlrom(PicoConfigFile);
+
 	gp2x_init();
 	if (currentConfig.EmuOpt&0x10) {
 		int ret = mmuhack();
@@ -97,6 +103,7 @@ int main(int argc, char *argv[])
 	}
 	sharedmem_init();
 	emu_Init();
+	menu_init();
 
 	engineState = PGS_Menu;