/*
- * (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.
create_profile_dir(PLUGINS_CFG_DIR);
create_profile_dir(CHEATS_DIR);
create_profile_dir(PATCHES_DIR);
-}
-
-static void CreateMemcard(char *filename, char *conf_mcd) {
- struct stat buf;
-
- make_path(conf_mcd, MAXPATHLEN, MEMCARD_DIR, filename);
-
- /* Only create a memory card if an existing one does not exist */
- if (stat(conf_mcd, &buf) == -1) {
- SysPrintf(_("Creating memory card: %s\n"), conf_mcd);
- CreateMcd(conf_mcd);
- }
+ create_profile_dir(PCSX_DOT_DIR "cfg");
}
void set_cd_image(const char *fname)
strcpy(Config.Net, "Disabled");
CheckSubDir();
-// ScanAllPlugins();
+ MAKE_PATH(Config.Mcd1, MEMCARD_DIR, "card1.mcd");
+ MAKE_PATH(Config.Mcd2, MEMCARD_DIR, "card2.mcd");
strcpy(Config.Bios, "HLE");
strcpy(Config.BiosDir, "./");
strcpy(Config.Cdr, "builtin_cdr");
strcpy(Config.Pad1, "builtin_pad");
strcpy(Config.Pad2, "builtin_pad");
-
- // try to load config
- // if the config file doesn't exist
- if (LoadConfig() == -1) {
- // Uh oh, no config file found, use some defaults
- Config.PsxAuto = 1;
-
- // create & load default memcards if they don't exist
- CreateMemcard("card1.mcd", Config.Mcd1);
- CreateMemcard("card2.mcd", Config.Mcd2);
-
- LoadMcds(Config.Mcd1, Config.Mcd2);
-
- SaveConfig();
- }
+ Config.PsxAuto = 1;
snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
/*
if (OpenPlugins() == -1) {
return 1;
}
+ plugin_call_rearmed_cbs();
- SysReset();
CheckCdrom();
+ SysReset();
if (file[0] != '\0') {
if (Load(file) != -1)
void SysReset() {
EmuReset();
+
+ // hmh core forgets this
+ CDR_stop();
}
void SysClose() {
}
void OnFile_Exit() {
- printf("OnFile_Exit\n");
+ printf("OnFile_Exit\n");
+ menu_finish();
+ plat_finish();
+ SysClose();
exit(0);
}
void *SysLoadLibrary(const char *lib) {
const char *tmp = strrchr(lib, '/');
+ void *ret;
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++)
return (void *)(long)(PLUGIN_DL_BASE + builtin_plugin_ids[i]);
}
- return dlopen(lib, RTLD_NOW);
+#if defined(__x86_64__) || defined(__i386__)
+ // convenience hack
+ char name[MAXPATHLEN];
+ snprintf(name, sizeof(name), "%s.x86", lib);
+ lib = name;
+#endif
+
+ ret = dlopen(lib, RTLD_NOW);
+ if (ret == NULL)
+ fprintf(stderr, "dlopen: %s\n", dlerror());
+ return ret;
}
void *SysLoadSym(void *lib, const char *sym) {