X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=3344819c2f03e70a61e30daa228c760135e8647d;hp=37c9ba32969ef78951c7b5d4d2cfa786cbb57029;hb=799b0b8773d6add1de99efd582c93701b82e970d;hpb=6fe1f05632f22ddba1d19814e2b14454e8e51940

diff --git a/frontend/main.c b/frontend/main.c
index 37c9ba32..3344819c 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -20,6 +20,7 @@
 #include "pcnt.h"
 #include "menu.h"
 #include "../libpcsxcore/misc.h"
+#include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/cdrcimg/cdrcimg.h"
 #include "common/plat.h"
 #include "common/input.h"
@@ -64,14 +65,12 @@ void set_cd_image(const char *fname)
 {
 	const char *ext = NULL;
 	
-	if (fname != NULL) {
-		int len = strlen(fname);
-		ext = fname;
-		if (len > 2)
-			ext = fname + len - 2;
-	}
+	if (fname != NULL)
+		ext = strrchr(fname, '.');
 
-	if (ext && strcasecmp(ext, ".z") == 0) {
+	if (ext && (
+	    strcasecmp(ext, ".z") == 0 || strcasecmp(ext, ".bz") == 0 ||
+	    strcasecmp(ext, ".znx") == 0 || strcasecmp(ext, ".pbp") == 0)) {
 		SetIsoFile(NULL);
 		cdrcimg_set_fname(fname);
 		strcpy(Config.Cdr, "builtin_cdrcimg");
@@ -101,12 +100,7 @@ static void set_default_paths(void)
 
 int main(int argc, char *argv[])
 {
-	char file[MAXPATHLEN] = "";
-	char path[MAXPATHLEN];
-	const char *cdfile = NULL;
-	int loadst = 0;
 	void *tmp;
-	int i;
 
 	tmp = dlopen("/lib/libdl.so.2", RTLD_LAZY);
 	if (tmp == NULL)
@@ -126,6 +120,22 @@ int main(int argc, char *argv[])
 	emuLog = stdout;
 	SetIsoFile(NULL);
 
+	memset(&Config, 0, sizeof(Config));
+
+	CheckSubDir();
+	set_default_paths();
+	strcpy(Config.Bios, "HLE");
+
+#ifdef MAEMO
+	extern int maemo_main(int argc, char **argv);
+	return maemo_main(argc, argv);
+#else
+	char file[MAXPATHLEN] = "";
+	char path[MAXPATHLEN];
+	const char *cdfile = NULL;
+	int loadst = 0;
+	int i;
+
 	// read command line options
 	for (i = 1; i < argc; i++) {
 		     if (!strcmp(argv[i], "-psxout")) Config.PsxOut = 1;
@@ -181,12 +191,6 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	memset(&Config, 0, sizeof(PcsxConfig));
-
-	CheckSubDir();
-	set_default_paths();
-	strcpy(Config.Bios, "HLE");
-
 	if (cdfile)
 		set_cd_image(cdfile);
 
@@ -250,11 +254,13 @@ int main(int argc, char *argv[])
 
 	while (1)
 	{
+		stop = 0;
 		psxCpu->Execute();
 		menu_loop();
 	}
 
 	return 0;
+#endif
 }
 
 int SysInit() {
@@ -313,7 +319,9 @@ void SysUpdate() {
 
 void OnFile_Exit() {
 	printf("OnFile_Exit\n");
+#ifndef MAEMO
 	menu_finish();
+#endif
 	plat_finish();
 	SysClose();
 	exit(0);