From 38c2028e228dcf17f3b4b0ac7e6984d1e1c6df79 Mon Sep 17 00:00:00 2001
From: notaz
Date: Sun, 29 Jul 2012 03:23:29 +0300
Subject: frontend: initial libretro support

..and some refactoring
---
 maemo/hildon.c |  4 ----
 maemo/main.c   | 15 ++++++++-------
 2 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'maemo')

diff --git a/maemo/hildon.c b/maemo/hildon.c
index 8e7635a..afe7bb2 100644
--- a/maemo/hildon.c
+++ b/maemo/hildon.c
@@ -186,10 +186,6 @@ void maemo_init(int *argc, char ***argv)
 	pl_rearmed_cbs.only_16bpp = 1;
 }
 
-void menu_loop(void)
-{
-}
-
 void *plat_gvideo_set_mode(int *w_, int *h_, int *bpp_)
 {
 	int w = *w_, h = *h_;
diff --git a/maemo/main.c b/maemo/main.c
index 7412791..2da693d 100644
--- a/maemo/main.c
+++ b/maemo/main.c
@@ -38,20 +38,26 @@ static void ChangeWorkingDirectory(char *exe)
 	}
 }
 
-int maemo_main(int argc, char **argv)
+int main(int argc, char **argv)
 {
-	ChangeWorkingDirectory("c");
 	char file[MAXPATHLEN] = "";
 	char path[MAXPATHLEN];
 	const char *cdfile = NULL;
 	int loadst = 0;
 	int i;
 
+	emu_core_preinit();
+	ChangeWorkingDirectory("c");
+
 	strcpy(Config.BiosDir, "/home/user/MyDocs");
 	strcpy(Config.PluginsDir, "/opt/maemo/usr/games/plugins");
 	snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "/opt/maemo/usr/games" PATCHES_DIR);
 	Config.PsxAuto = 1;
 	
+	pl_init();
+
+	emu_core_init();
+
 	// read command line options
 	for (i = 1; i < argc; i++) {
 		     if (!strcmp(argv[i], "-psxout")) Config.PsxOut = 1;
@@ -97,11 +103,6 @@ int maemo_main(int argc, char **argv)
 		strcpy(file_name, strrchr(cdfile,'/'));
 	}
 
-	if (SysInit() == -1)
-		return 1;
-
-	pl_init();
-
 	if (LoadPlugins() == -1) {
 		SysMessage("Failed loading plugins!");
 		return 1;
-- 
cgit v1.2.3