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
drop some unused code
[pcsx_rearmed.git]
/
frontend
/
main.c
diff --git
a/frontend/main.c
b/frontend/main.c
index
56b5cb7
..
a71ddea
100644
(file)
--- a/
frontend/main.c
+++ b/
frontend/main.c
@@
-25,12
+25,14
@@
#include "../libpcsxcore/cheat.h"
#include "../libpcsxcore/new_dynarec/new_dynarec.h"
#include "../plugins/cdrcimg/cdrcimg.h"
#include "../libpcsxcore/cheat.h"
#include "../libpcsxcore/new_dynarec/new_dynarec.h"
#include "../plugins/cdrcimg/cdrcimg.h"
-#include "common/plat.h"
-#include "common/readpng.h"
-#include "common/input.h"
-#include "linux/in_evdev.h"
#include "revision.h"
#include "revision.h"
+#ifndef NO_FRONTEND
+#include "libpicofe/input.h"
+#include "libpicofe/plat.h"
+#include "libpicofe/readpng.h"
+#endif
+
// don't include debug.h - it breaks ARM build (R1 redefined)
void StartDebugger();
void StopDebugger();
// don't include debug.h - it breaks ARM build (R1 redefined)
void StartDebugger();
void StopDebugger();
@@
-262,7
+264,7
@@
do_state_slot:
}
case SACTION_VOLUME_UP:
case SACTION_VOLUME_DOWN:
}
case SACTION_VOLUME_UP:
case SACTION_VOLUME_DOWN:
- plat_step_volume(emu_action == SACTION_VOLUME_UP);
+ plat_
target_
step_volume(emu_action == SACTION_VOLUME_UP);
return;
case SACTION_MINIMIZE:
if (GPU_close != NULL)
return;
case SACTION_MINIMIZE:
if (GPU_close != NULL)
@@
-858,15
+860,6
@@
void *SysLoadLibrary(const char *lib) {
return (void *)(long)(PLUGIN_DL_BASE + builtin_plugin_ids[i]);
}
return (void *)(long)(PLUGIN_DL_BASE + builtin_plugin_ids[i]);
}
-#if defined(__x86_64__) || defined(__i386__)
- // convenience hack
- if (strstr(lib, ".x86") == NULL) {
- char name[MAXPATHLEN];
- snprintf(name, sizeof(name), "%s.x86_64", lib);
- lib = name;
- }
-#endif
-
ret = dlopen(lib, RTLD_NOW);
if (ret == NULL)
fprintf(stderr, "dlopen: %s\n", dlerror());
ret = dlopen(lib, RTLD_NOW);
if (ret == NULL)
fprintf(stderr, "dlopen: %s\n", dlerror());