notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve event handling again
[pcsx_rearmed.git]
/
frontend
/
main.c
diff --git
a/frontend/main.c
b/frontend/main.c
index
e36ad48
..
86aff34
100644
(file)
--- a/
frontend/main.c
+++ b/
frontend/main.c
@@
-14,6
+14,7
@@
#include <unistd.h>
#include "plugin.h"
#include <unistd.h>
#include "plugin.h"
+#include "pcnt.h"
#include "../gui/Linux.h"
#include "../libpcsxcore/misc.h"
#include "../gui/Linux.h"
#include "../libpcsxcore/misc.h"
@@
-72,6
+73,8
@@
int main(int argc, char *argv[])
int i;
tmp = dlopen("/lib/libdl.so.2", RTLD_LAZY);
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) {
if (tmp != NULL)
real_getenv = dlsym(tmp, "getenv");
if (real_getenv == NULL) {
@@
-86,7
+89,6
@@
int main(int argc, char *argv[])
emuLog = stdout;
SetIsoFile(NULL);
emuLog = stdout;
SetIsoFile(NULL);
- Config.PsxOut = 1;
// read command line options
for (i = 1; i < argc; i++) {
// read command line options
for (i = 1; i < argc; i++) {
@@
-192,6
+194,7
@@
int main(int argc, char *argv[])
SysMessage("Failed loading plugins!");
return 1;
}
SysMessage("Failed loading plugins!");
return 1;
}
+ pcnt_hook_plugins();
if (OpenPlugins() == -1) {
return 1;
if (OpenPlugins() == -1) {
return 1;
@@
-216,7
+219,8
@@
int main(int argc, char *argv[])
if (loadst) {
StatesC = loadst - 1;
char *state_filename = get_state_filename(StatesC);
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);
}
free(state_filename);
}
@@
-351,19
+355,6
@@
void SysPrintf(const char *fmt, ...) {
vsprintf(msg, fmt, list);
va_end(list);
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);
}
fprintf(emuLog, "%s", msg);
}