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
plugin_lib: export more functions
[pcsx_rearmed.git]
/
frontend
/
main.c
diff --git
a/frontend/main.c
b/frontend/main.c
index
15e2be4
..
0427ce4
100644
(file)
--- a/
frontend/main.c
+++ b/
frontend/main.c
@@
-1,5
+1,5
@@
/*
/*
- * (C) notaz, 2010
+ * (C) notaz, 2010
-2011
*
* This work is licensed under the terms of the GNU GPLv2 or later.
* See the COPYING file in the top-level directory.
*
* This work is licensed under the terms of the GNU GPLv2 or later.
* See the COPYING file in the top-level directory.
@@
-163,7
+163,6
@@
int main(int argc, char *argv[])
strcpy(Config.Net, "Disabled");
CheckSubDir();
strcpy(Config.Net, "Disabled");
CheckSubDir();
-// ScanAllPlugins();
MAKE_PATH(Config.Mcd1, MEMCARD_DIR, "card1.mcd");
MAKE_PATH(Config.Mcd2, MEMCARD_DIR, "card2.mcd");
MAKE_PATH(Config.Mcd1, MEMCARD_DIR, "card1.mcd");
MAKE_PATH(Config.Mcd2, MEMCARD_DIR, "card2.mcd");
@@
-208,9
+207,10
@@
int main(int argc, char *argv[])
if (OpenPlugins() == -1) {
return 1;
}
if (OpenPlugins() == -1) {
return 1;
}
+ plugin_call_rearmed_cbs();
- SysReset();
CheckCdrom();
CheckCdrom();
+ SysReset();
if (file[0] != '\0') {
if (Load(file) != -1)
if (file[0] != '\0') {
if (Load(file) != -1)
@@
-298,6
+298,7
@@
void UpdateMenuSlots() {
void OnFile_Exit() {
printf("OnFile_Exit\n");
void OnFile_Exit() {
printf("OnFile_Exit\n");
+ menu_finish();
plat_finish();
SysClose();
exit(0);
plat_finish();
SysClose();
exit(0);
@@
-423,9
+424,11
@@
static const int builtin_plugin_ids[] = {
void *SysLoadLibrary(const char *lib) {
const char *tmp = strrchr(lib, '/');
void *SysLoadLibrary(const char *lib) {
const char *tmp = strrchr(lib, '/');
+ void *ret;
int i;
int i;
- printf("dlopen %s\n", lib);
+ printf("plugin: %s\n", lib);
+
if (tmp != NULL) {
tmp++;
for (i = 0; i < ARRAY_SIZE(builtin_plugins); i++)
if (tmp != NULL) {
tmp++;
for (i = 0; i < ARRAY_SIZE(builtin_plugins); i++)
@@
-440,7
+443,10
@@
void *SysLoadLibrary(const char *lib) {
lib = name;
#endif
lib = name;
#endif
- return dlopen(lib, RTLD_NOW);
+ ret = dlopen(lib, RTLD_NOW);
+ if (ret == NULL)
+ fprintf(stderr, "dlopen: %s\n", dlerror());
+ return ret;
}
void *SysLoadSym(void *lib, const char *sym) {
}
void *SysLoadSym(void *lib, const char *sym) {