X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=550242a9c08108bae6b5ab3469b22330ca718191;hp=9f245409c6ec1324d6c9e6a658c33c3cdac09181;hb=e0c692d9417fdea51a1deebda1048d1a91f1270f;hpb=b7b2fb4165eee505bc05cbf23309bb5ed4289494 diff --git a/frontend/main.c b/frontend/main.c index 9f245409..550242a9 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -99,12 +99,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) @@ -124,6 +119,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; @@ -179,12 +190,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); @@ -253,6 +258,7 @@ int main(int argc, char *argv[]) } return 0; +#endif } int SysInit() { @@ -311,7 +317,9 @@ void SysUpdate() { void OnFile_Exit() { printf("OnFile_Exit\n"); +#ifndef MAEMO menu_finish(); +#endif plat_finish(); SysClose(); exit(0);