diff --git a/android/phoenix/assets/libretro_cores.cfg b/android/phoenix/assets/libretro_cores.cfg index 8662f1c800..649b3de473 100644 --- a/android/phoenix/assets/libretro_cores.cfg +++ b/android/phoenix/assets/libretro_cores.cfg @@ -1,86 +1,89 @@ -mednafen_pce_fast_libretro_android = "Mednafen PCE-fast" -mednafen_pce_fast_libretro_android_system = "PC Engine/PC Engine CD" +libretro_mednafen_pce_fast = "Mednafen PCE-fast" +libretro_mednafen_pce_fast_system = "PC Engine/PC Engine CD" -mednafen_wswan_libretro_android = "Mednafen WSwan" -mednafen_wswan_libretro_android_system = "Wonderswan" +libretro_mednafen_wswan = "Mednafen WSwan" +libretro_mednafen_wswan_system = "Wonderswan" -fceumm_libretro_android = "FCEUmm" -fceumm_libretro_android_system = "Nintendo NES" +libretro_fceumm = "FCEUmm" +libretro_fceumm_system = "Nintendo NES" -mednafen_vb_libretro_android = "Mednafen VB" -mednafen_vb_libretro_android_system = "Virtual Boy" +libretro_mednafen_vb = "Mednafen VB" +libretro_mednafen_vb_system = "Virtual Boy" -fba_libretro_android = "Final Burn Alpha" -fba_libretro_anddroid_system = "Arcade" +libretro_fba = "Final Burn Alpha" +libretro_fba_system = "Arcade" -mednafen_ngp_libretro_android = "Mednafen NGP" -mednafen_ngp_libretro_android_system = "Neo-Geo Pocket" +libretro_mednafen_ngp = "Mednafen NGP" +libretro_mednafen_ngp_system = "Neo-Geo Pocket" -mednafen_psx_libretro_android = "Mednafen PSX" -mednafen_psx_libretro_android_system = "PlayStation1" +libretro_mednafen_psx = "Mednafen PSX" +libretro_mednafen_psx_system = "PlayStation1" -gambatte_libretro_android = "Gambatte" -gambatte_libretro_android_system = "GameBoy/GameBoy Color" +libretro_gambatte = "Gambatte" +libretro_gambatte_system = "GameBoy/GameBoy Color" -handy_libretro_android = "Handy" -handy_libretro_android_system = "Atari Lynx" +libretro_handy = "Handy" +libretro_handy_system = "Atari Lynx" -genesis_plus_gx_libretro_android = "Genesis Plus GX" -genesis_plus_gx_libretro_android_system = "Sega Genesis/Sega CD/Master System" +libretro_genesis_plus_gx = "Genesis Plus GX" +libretro_genesis_plus_gx_system = "Sega Genesis/Sega CD/Master System" -picodrive_libretro_android = "Picodrive" -picodrive_libretro_android_system = "Sega Genesis/Sega CD/Master System/32X" +libretro_picodrive = "Picodrive" +libretro_picodrive_system = "Sega Genesis/Sega CD/Master System/32X" -vba_next_libretro_android = "VBA Next" -vba_next_libretro_android_system = "GameBoy Advance" +libretro_vba_next = "VBA Next" +libretro_vba_next_system = "GameBoy Advance" -vbam_libretro_android = "VBA-M" -vbam_libretro_android_system = "GameBoy Advance" +libretro_vbam = "VBA-M" +libretro_vbam_system = "GameBoy Advance" -prboom_libretro_android = "PrBoom" -prboom_libretro_android_system = "DOOM" +libretro_prboom = "PrBoom" +libretro_prboom_system = "DOOM" -snes9x_libretro_android = "SNES9x" -snes9x_libretro_android_system = "Nintendo SNES" +libretro_snes9x = "SNES9x" +libretro_snes9x_system = "Nintendo SNES" -snes9x_next_libretro_android = "SNES9x Next" -snes9x_next_libretro_android_system = "Nintendo SNES" +libretro_snes9x_next = "SNES9x Next" +libretro_snes9x_next_system = "Nintendo SNES" -nestopia_libretro_android = "Nestopia" -nestopia_libretro_android_system = "Nintendo NES" +libretro_nestopia = "Nestopia" +libretro_nestopia_system = "Nintendo NES" -pcsx_rearmed_libretro_android = "PCSX-reARMed" -pcsx_rearmed_libretro_android_system = "PlayStation1" +libretro_pcsx_rearmed-neon = "PCSX-reARMed [NEON]" +libretro_pcsx_rearmed-neon_system = "PlayStation1" -nxengine_libretro_android = "NXEngine" -nxengine_libretro_android_system = "Cave Story/Doukutsu Monogatari" +libretro_pcsx_rearmed = "PCSX-reARMed" +libretro_pcsx_rearmed_system = "PlayStation1" -quicknes_libretro_android = "QuickNES" -quicknes_libretro_android_system = "Nintendo NES" +libretro_nxengine = "NXEngine" +libretro_nxengine_system = "Cave Story/Doukutsu Monogatari" -tyrquake_libretro_android = "TyrQuake" -tyrquake_libretro_android_system = "Quake 1" +libretro_quicknes = "QuickNES" +libretro_quicknes_system = "Nintendo NES" -instancingviewer_libretro_android = "InstancingViewer" -instancingviewer_libretro_android_system = "Images" +libretro_tyrquake = "TyrQuake" +libretro_tyrquake_system = "Quake 1" -desmume_libretro_android = "Desmume" -desmume_libretro_android_system = "Nintendo DS" +libretro_instancingviewer = "InstancingViewer" +libretro_instancingviewer_system = "Images" -stella_libretro_android = "Stella" -stella_lilbretro_android_system = "Atari 2600" +libretro_desmume = "Desmume" +libretro_desmume_system = "Nintendo DS" -scenewalker_libretro_android = "SceneWalker" -scenewalker_libretro_android_system = "Objects" +libretro_stella = "Stella" +libretro_stella_system = "Atari 2600" -modelviewer_libretro_android = "ModelViewer" -modelviewer_libretro_android_system = "Objects" +libretro_scenewalker = "SceneWalker" +libretro_scenewalker_system = "Objects" -mame078_libretro_android = "MAME 2003 [0.78]" -mame078_libretro_android_system = "Arcade" +libretro_modelviewer = "ModelViewer" +libretro_modelviewer_system = "Objects" -bsnes_performance_libretro_android = "bsnes/higan Performance" -bsnes_performance_libretro_android_system = "Nintendo SNES" +libretro_mame078 = "MAME 2003 [0.78]" +libretro_mame078_system = "Arcade" -dinothawr_libretro_android = "Dinothawr" -dinothawr_libretro_android_system = "Puzzle Game" +libretro_bsnes_performance = "bsnes/higan Performance" +libretro_bsnes_performance_system = "Nintendo SNES" + +libretro_dinothawr = "Dinothawr" +libretro_dinothawr_system = "Puzzle Game" diff --git a/android/phoenix/project.properties b/android/phoenix/project.properties index ce39f2d0a0..a3ee5ab64f 100644 --- a/android/phoenix/project.properties +++ b/android/phoenix/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-18 +target=android-17 diff --git a/android/phoenix/src/org/retroarch/browser/CoreSelection.java b/android/phoenix/src/org/retroarch/browser/CoreSelection.java index fb14d7ee28..c6dfeaeb58 100644 --- a/android/phoenix/src/org/retroarch/browser/CoreSelection.java +++ b/android/phoenix/src/org/retroarch/browser/CoreSelection.java @@ -48,10 +48,35 @@ public final class CoreSelection extends ListActivity { for (final File lib : libs) { String libName = lib.getName(); +<<<<<<< HEAD Log.i(TAG, "Libretro core: " + libName); +======= + // Never append a NEON lib if we don't have NEON. + if (libName.contains("neon") && !cpuIsNeon) + continue; + + // If we have a NEON version with NEON capable CPU, + // never append a non-NEON version. + if (cpuIsNeon && !libName.contains("neon")) { + boolean hasNeonVersion = false; + for (final File lib_ : libs) { + String otherName = lib_.getName(); + String baseName = libName.replace(".so", ""); + if (otherName.contains("neon") + && otherName.startsWith(baseName)) { + hasNeonVersion = true; + break; + } + } + + if (hasNeonVersion) + continue; + } +>>>>>>> parent of 1bcf1af... (Android) Some preliminary changes for new libretro core naming convention - still not // Allow both libretro-core.so and libretro_core.so. - if (!libName.startsWith("libretroarch")) { + if (libName.startsWith("libretro") + && !libName.startsWith("libretroarch")) { try { adapter.add(new ModuleWrapper(this, lib, core_config)); } catch (IOException e) { diff --git a/android/phoenix/src/org/retroarch/browser/preferences/UserPreferences.java b/android/phoenix/src/org/retroarch/browser/preferences/UserPreferences.java index 087339fb56..5b03b23b99 100644 --- a/android/phoenix/src/org/retroarch/browser/preferences/UserPreferences.java +++ b/android/phoenix/src/org/retroarch/browser/preferences/UserPreferences.java @@ -373,7 +373,6 @@ public final class UserPreferences path.lastIndexOf(".")); sanitized_name = sanitized_name.replace("neon", ""); sanitized_name = sanitized_name.replace("libretro_", ""); - sanitized_name = sanitized_name.replace("_android", ""); return sanitized_name; }