diff --git a/build-config.sh b/build-config.sh index a552095b..6362637d 100644 --- a/build-config.sh +++ b/build-config.sh @@ -55,6 +55,7 @@ include_core_fceumm include_core_nestopia include_core_quicknes include_core_bnes +include_core_mesen # --- Nintendo DS emulator cores --- include_core_desmume diff --git a/recipes/android/cores-android-cmake-aarch64 b/recipes/android/cores-android-cmake-aarch64 index bf76b444..ccafbda5 100644 --- a/recipes/android/cores-android-cmake-aarch64 +++ b/recipes/android/cores-android-cmake-aarch64 @@ -1,4 +1,4 @@ dolphin libretro-dolphin-aarch64 https://github.com/libretro/dolphin.git master YES CMAKE Makefile build -DLIBRETRO=ON -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release ishiiruka libretro-ishiiruka-aarch64 https://github.com/libretro/Ishiiruka.git master YES CMAKE Makefile build -DLIBRETRO=ON -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release -ppsspp libretro-ppsspp-aarch64 https://github.com/hrydgard/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release +ppsspp libretro-ppsspp-aarch64 https://github.com/libretro/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release thepowdertoy libretro-thepowdertoy-aarch64 https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release diff --git a/recipes/android/cores-android-cmake-armv7 b/recipes/android/cores-android-cmake-armv7 index 215c874f..82a3ffe5 100644 --- a/recipes/android/cores-android-cmake-armv7 +++ b/recipes/android/cores-android-cmake-armv7 @@ -1,2 +1,2 @@ -ppsspp libretro-ppsspp-armv7 https://github.com/hrydgard/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DANDROID_STL=c++_static -DANDROID_ARM_NEON=ON -DANDROID_ARM_MODE=arm -DCMAKE_BUILD_TYPE=Release +ppsspp libretro-ppsspp-armv7 https://github.com/libretro/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DANDROID_STL=c++_static -DANDROID_ARM_NEON=ON -DANDROID_ARM_MODE=arm -DCMAKE_BUILD_TYPE=Release thepowdertoy libretro-thepowdertoy-armv7 https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DANDROID_STL=c++_static -DANDROID_ARM_NEON=ON -DCMAKE_BUILD_TYPE=Release diff --git a/recipes/android/cores-android-cmake-x86 b/recipes/android/cores-android-cmake-x86 index 337d9743..cbfabe6d 100644 --- a/recipes/android/cores-android-cmake-x86 +++ b/recipes/android/cores-android-cmake-x86 @@ -1,2 +1,2 @@ -ppsspp libretro-ppsspp-x86 https://github.com/hrydgard/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release +ppsspp libretro-ppsspp-x86 https://github.com/libretro/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release thepowdertoy libretro-thepowdertoy-x86 https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release diff --git a/recipes/android/cores-android-jni b/recipes/android/cores-android-jni index da3313cc..c7a7497a 100644 --- a/recipes/android/cores-android-jni +++ b/recipes/android/cores-android-jni @@ -68,7 +68,7 @@ pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC_JNI Makefile.libretro jni pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC_JNI Makefile jni pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC_JNI Makefile jni -ppsspp libretro-ppsspp https://github.com/hrydgard/ppsspp.git master NO GENERIC_JNI Makefile libretro/jni +ppsspp libretro-ppsspp https://github.com/libretro/ppsspp.git master NO GENERIC_JNI Makefile libretro/jni prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC_JNI Makefile jni prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC_JNI Makefile jni puae libretro-puae https://github.com/libretro/libretro-uae.git master YES GENERIC_JNI Makefile jni diff --git a/recipes/apple/cores-ios-generic b/recipes/apple/cores-ios-generic index 3dfb2c89..fb72a924 100644 --- a/recipes/apple/cores-ios-generic +++ b/recipes/apple/cores-ios-generic @@ -63,7 +63,7 @@ pcsx_rearmed_interpreter libretro-pcsx_rearmed_interpreter https://github.com/li picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro . pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile . pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile . -ppsspp libretro-ppsspp https://github.com/hrydgard/ppsspp.git master YES GENERIC_GL Makefile libretro +ppsspp libretro-ppsspp https://github.com/libretro/ppsspp.git master YES GENERIC_GL Makefile libretro prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC_ALT Makefile . prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile . puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile . diff --git a/recipes/apple/cores-ios9-generic b/recipes/apple/cores-ios9-generic index d8e090d9..8ab2923d 100644 --- a/recipes/apple/cores-ios9-generic +++ b/recipes/apple/cores-ios9-generic @@ -63,7 +63,7 @@ pcsx_rearmed_interpreter libretro-pcsx_rearmed_interpreter https://github.com/li picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro . pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile . pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile . -ppsspp libretro-ppsspp https://github.com/hrydgard/ppsspp.git master YES GENERIC_GL Makefile libretro +ppsspp libretro-ppsspp https://github.com/libretro/ppsspp.git master YES GENERIC_GL Makefile libretro prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC_ALT Makefile . prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile . puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile . diff --git a/recipes/apple/cores-osx-x64-generic b/recipes/apple/cores-osx-x64-generic index 1050bb4c..cecea1df 100644 --- a/recipes/apple/cores-osx-x64-generic +++ b/recipes/apple/cores-osx-x64-generic @@ -74,7 +74,7 @@ pcsx_rearmed_interpreter libretro-pcsx_rearmed_interpreter https://github.com/li picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro . pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile . pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile . -ppsspp libretro-ppsspp https://github.com/hrydgard/ppsspp.git master YES GENERIC_GL Makefile libretro +ppsspp libretro-ppsspp https://github.com/libretro/ppsspp.git master YES GENERIC_GL Makefile libretro prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC_ALT Makefile . prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile . puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile . diff --git a/recipes/linux/cores-linux-arm7neonhf b/recipes/linux/cores-linux-arm7neonhf index 06c77762..8d99702c 100644 --- a/recipes/linux/cores-linux-arm7neonhf +++ b/recipes/linux/cores-linux-arm7neonhf @@ -74,7 +74,7 @@ pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro . pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile . pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile . -ppsspp libretro-ppsspp https://github.com/hrydgard/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release +ppsspp libretro-ppsspp https://github.com/libretro/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC Makefile . prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile . puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile . diff --git a/recipes/linux/cores-linux-armhf-generic b/recipes/linux/cores-linux-armhf-generic index 364d8271..be768b01 100644 --- a/recipes/linux/cores-linux-armhf-generic +++ b/recipes/linux/cores-linux-armhf-generic @@ -74,7 +74,7 @@ pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro . pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile . pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile . -ppsspp libretro-ppsspp https://github.com/hrydgard/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release +ppsspp libretro-ppsspp https://github.com/libretro/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC Makefile . prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile . puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile . diff --git a/recipes/linux/cores-linux-x64-generic b/recipes/linux/cores-linux-x64-generic index 3910ceaa..37ff0590 100644 --- a/recipes/linux/cores-linux-x64-generic +++ b/recipes/linux/cores-linux-x64-generic @@ -81,7 +81,7 @@ pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro . pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile . pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile . -ppsspp libretro-ppsspp https://github.com/hrydgard/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release +ppsspp libretro-ppsspp https://github.com/libretro/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC Makefile . prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile . puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile . diff --git a/recipes/linux/cores-linux-x86-generic b/recipes/linux/cores-linux-x86-generic index 08b01fb8..e41de03d 100644 --- a/recipes/linux/cores-linux-x86-generic +++ b/recipes/linux/cores-linux-x86-generic @@ -77,7 +77,7 @@ pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro . pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile . pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile . -ppsspp libretro-ppsspp https://github.com/hrydgard/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release +ppsspp libretro-ppsspp https://github.com/libretro/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC Makefile . prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile . puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile . diff --git a/recipes/windows/cores-windows-x64_seh-generic b/recipes/windows/cores-windows-x64_seh-generic index 9ab034b2..093cef41 100644 --- a/recipes/windows/cores-windows-x64_seh-generic +++ b/recipes/windows/cores-windows-x64_seh-generic @@ -79,7 +79,7 @@ pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro . pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile . pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile . -ppsspp libretro-ppsspp https://github.com/hrydgard/ppsspp.git master YES GENERIC_GL Makefile libretro platform=windows_msvc2017_desktop_x64 +ppsspp libretro-ppsspp https://github.com/libretro/ppsspp.git master YES GENERIC_GL Makefile libretro platform=windows_msvc2017_desktop_x64 prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC Makefile . prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile . puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile . diff --git a/recipes/windows/cores-windows-x86_dw2-generic b/recipes/windows/cores-windows-x86_dw2-generic index a55cb70a..6a7ee4d5 100644 --- a/recipes/windows/cores-windows-x86_dw2-generic +++ b/recipes/windows/cores-windows-x86_dw2-generic @@ -77,7 +77,7 @@ pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro . pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile . pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile . -ppsspp libretro-ppsspp https://github.com/hrydgard/ppsspp.git master YES GENERIC_GL Makefile libretro platform=windows_msvc2017_desktop_x86 +ppsspp libretro-ppsspp https://github.com/libretro/ppsspp.git master YES GENERIC_GL Makefile libretro platform=windows_msvc2017_desktop_x86 prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC Makefile . prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile . puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile . diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh index dd72bf2a..a85391bc 100644 --- a/rules.d/core-rules.sh +++ b/rules.d/core-rules.sh @@ -683,6 +683,12 @@ include_core_theodore() { libretro_theodore_name="Theodore" libretro_theodore_git_url="https://github.com/Zlika/theodore.git" +include_core_mesen() { + register_module core "mesen" +} +libretro_mesen_name="Mesen" +libretro_mesen_git_url="https://github.com/SourMesen/Mesen.git" + include_core_mupen64plus() { register_module core "mupen64plus" -theos_ios -ngc -ps3 -psp1 -wii }