X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=86aff3481f42f60e77e5aab7535ab7a3a898c4b3;hp=884b6176c39a4d737704f5a510107bd5515a7476;hb=1972732abfea710d3d7b61180971580d9e5081ce;hpb=14dffdb7a0457fc647103deafa5f1cac12e888fb diff --git a/frontend/main.c b/frontend/main.c index 884b6176..86aff348 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -73,6 +73,8 @@ int main(int argc, char *argv[]) int i; tmp = dlopen("/lib/libdl.so.2", RTLD_LAZY); + if (tmp == NULL) + tmp = dlopen("/lib32/libdl.so.2", RTLD_LAZY); if (tmp != NULL) real_getenv = dlsym(tmp, "getenv"); if (real_getenv == NULL) { @@ -87,7 +89,6 @@ int main(int argc, char *argv[]) emuLog = stdout; SetIsoFile(NULL); - Config.PsxOut = 1; // read command line options for (i = 1; i < argc; i++) { @@ -218,7 +219,8 @@ int main(int argc, char *argv[]) if (loadst) { StatesC = loadst - 1; char *state_filename = get_state_filename(StatesC); - LoadState(state_filename); + int ret = LoadState(state_filename); + printf("%s state %s\n", ret ? "failed to load" : "loaded", state_filename); free(state_filename); } @@ -353,19 +355,6 @@ void SysPrintf(const char *fmt, ...) { vsprintf(msg, fmt, list); va_end(list); - if (Config.PsxOut) { - static char linestart = 1; - int l = strlen(msg); - - printf(linestart ? " * %s" : "%s", msg); - - if (l > 0 && msg[l - 1] == '\n') { - linestart = 1; - } else { - linestart = 0; - } - } - fprintf(emuLog, "%s", msg); }