diff options
| -rw-r--r-- | Makefile.caanoo | 4 | ||||
| -rw-r--r-- | frontend/menu.c | 38 | ||||
| -rw-r--r-- | readme.txt | 10 |
3 files changed, 33 insertions, 19 deletions
diff --git a/Makefile.caanoo b/Makefile.caanoo index e9228f5..2711c2b 100644 --- a/Makefile.caanoo +++ b/Makefile.caanoo @@ -4,8 +4,7 @@ PLATFORM=caanoo include Makefile -PLUGINS = plugins/spunull/spunull.so plugins/gpu_unai/gpuPCSX4ALL.so \ - plugins/gpu_neon/gpu_neon.so +PLUGINS = plugins/spunull/spunull.so plugins/gpu_unai/gpuPCSX4ALL.so # ----------- release ----------- @@ -18,7 +17,6 @@ rel_caanoo: pcsx $(PLUGINS) \ mkdir -p out/pcsx_rearmed/plugins cp -r $^ out/pcsx_rearmed/ mv out/pcsx_rearmed/*.so out/pcsx_rearmed/plugins/ - mv out/pcsx_rearmed/plugins/gpu_neon.so out/pcsx_rearmed/plugins/gpuPEOPS2.so mv out/pcsx_rearmed/caanoo.gpe out/pcsx_rearmed/pcsx.gpe mv out/pcsx_rearmed/pcsx_rearmed.ini out/ mkdir out/pcsx_rearmed/lib/ diff --git a/frontend/menu.c b/frontend/menu.c index 83ad1c4..24080b9 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -378,7 +378,7 @@ static int menu_load_config(int is_game) f = fopen(cfgfile, "r"); if (f == NULL) { printf("menu_load_config: failed to open: %s\n", cfgfile); - return -1; + goto fail; } fseek(f, 0, SEEK_END); @@ -446,6 +446,14 @@ static int menu_load_config(int is_game) } } + keys_load_all(cfg); + ret = 0; +fail_read: + free(cfg); +fail: + if (f != NULL) + fclose(f); + menu_sync_config(); // sync plugins @@ -461,12 +469,6 @@ static int menu_load_config(int is_game) if (strcmp(Config.Spu, spu_plugins[i]) == 0) { spu_plugsel = i; break; } - keys_load_all(cfg); - ret = 0; -fail_read: - free(cfg); -fail: - fclose(f); return ret; } @@ -1460,14 +1462,22 @@ static void menu_bios_warn(void) { int inp; static const char msg[] = - "You don't seem to have copied any BIOS files to\n" + "You don't seem to have copied any BIOS\n" + "files to\n" +#ifdef __ARM_ARCH_7A__ // XXX "<SD card>/pandora/appdata/pcsx_rearmed/bios/\n\n" - "While many games work fine with fake (HLE) BIOS,\n" - "others (like MGS and FF8) require BIOS to work.\n" - "After copying the file, you'll also need to\n" - "select it in the emu's options->[BIOS/Plugins]\n\n" - "The file is usually named SCPH1001.BIN, but\n" - "other not compressed files can be used too.\n\n" +#else + "pcsx_rearmed/bios/\n\n" +#endif + "While many games work fine with fake\n" + "(HLE) BIOS, others (like MGS and FF8)\n" + "require BIOS to work.\n" + "After copying the file, you'll also need\n" + "to select it in the emu's menu:\n" + "options->[BIOS/Plugins]\n\n" + "The file is usually named SCPH1001.BIN,\n" + "but other not compressed files can be\n" + "used too.\n\n" "Press (B) or (X) to continue"; while (1) @@ -68,11 +68,17 @@ spunull.so - NULL plugin, i.e. no sound emulation. Changelog --------- -r10 (2011-09-23) +r10 (2011-10-10) ++ added Caanoo port ++ completely rewrote memory handlers + added fixed frameskip option ++ added ability to change PSX clock ++ implemented GTE dead flag detection +* switched to larger timeslices for better performance +* fixed some cases of flickering * fixed a crash in PCSX4ALL GPU plugin * fixed several dynarec compatibility related issues (hopefully) -* fixed several SPU regressions from r9 +* fixed multiple SPU regressions from r9 and earlier * fixed frame limiter issue that sometimes caused stuttering * fixed some minor GUI issues |