diff --git a/build-config.sh b/build-config.sh index 93005ab5..4be8ab65 100644 --- a/build-config.sh +++ b/build-config.sh @@ -136,7 +136,7 @@ include_core_mame2000 include_core_mame2003 include_core_mame2003_plus include_core_mame2010 -include_core_mame2014 +include_core_mame2015 include_core_mame2016 include_core_mame diff --git a/dist/info/mess2014_libretro.info b/dist/info/mess2014_libretro.info deleted file mode 100644 index 34c8438d..00000000 --- a/dist/info/mess2014_libretro.info +++ /dev/null @@ -1,13 +0,0 @@ -display_name = "MULTI (MESS 2014)" -authors = "MAMEdev" -supported_extensions = "zip|chd|7z" -corename = "MESS 2014 (Git)" -manufacturer = "Various" -categories = "Emulator" -systemname = "MULTI (various)" -systemid = "mame" -license = "MAME" -permissions = "" -display_version = "Git" -supports_no_game = "false" -notes = "[1] MESS 2014 (Git) requires the hashes from the MAME/MESS source code|[^] to be inside the 'SYSTEMDIR\ume\hash' directory and softlist romset.|(!) [2] MESS 2014 (Git) supports MESS save states.|[3] MESS 2014 (Git) supports extracted MESS cheats.|[4] The BIOS files must be inside the ROM directory.|[5] The same directory with CHD files inside must be inside the ROM directory.|[6] If desired, the ARTWORK, CHEATS, and SAMPLES directories can be|[^] inside the 'SYSTEMDIR\mess' directory.|[7] When saving, the following directories will be created in the 'SAVEDIR\mess'|[^] directory: STATES, NVRAM, INPUT, SNAPS, CFG, MEMCARD, and DIFF." diff --git a/dist/info/mess2015_libretro.info b/dist/info/mess2015_libretro.info new file mode 100644 index 00000000..12b2b8ec --- /dev/null +++ b/dist/info/mess2015_libretro.info @@ -0,0 +1,13 @@ +display_name = "Multi (MESS 2015)" +authors = "MAMEdev" +supported_extensions = "zip|chd|7z" +corename = "MESS 2015 (0.160)" +manufacturer = "Various" +categories = "Emulator" +systemname = "Multi (various)" +systemid = "mame" +license = "MAME" +permissions = "" +display_version = "Git" +supports_no_game = "false" +notes = "[1] MESS 2015 requires the hashes from the MAME/MESS source code|[^] to be inside the 'SYSTEMDIR\ume\hash' directory and softlist romset.|(!) [2] MESS 2015 supports MESS save states.|[3] MESS 2015 supports extracted MESS cheats.|[4] The BIOS files must be inside the ROM directory.|[5] The same directory with CHD files inside must be inside the ROM directory.|[6] If desired, the ARTWORK, CHEATS, and SAMPLES directories can be|[^] inside the 'SYSTEMDIR\mess' directory.|[7] When saving, the following directories will be created in the 'SAVEDIR\mess'|[^] directory: STATES, NVRAM, INPUT, SNAPS, CFG, MEMCARD, and DIFF." diff --git a/dist/info/ume2014_libretro.info b/dist/info/ume2014_libretro.info deleted file mode 100644 index 39f65882..00000000 --- a/dist/info/ume2014_libretro.info +++ /dev/null @@ -1,13 +0,0 @@ -display_name = "MULTI (UME 2014)" -authors = "MAMEdev" -supported_extensions = "zip|chd|7z" -corename = "UME 2014 (Git)" -manufacturer = "Various" -categories = "Emulator" -systemname = "MULTI (various)" -systemid = "mame" -license = "MAME" -permissions = "" -display_version = "Git" -supports_no_game = "false" -notes = "[1] UME 2014 (Git) requires the hashes from the MAME/MESS source code|[^] to be inside the 'SYSTEMDIR\ume\hash' directory and softlist romset|(!) [2] UME 2014 (Git) supports UME save states.|[3] UME 2014 (Git) supports extracted UME cheats.|[4] The BIOS files must be inside the ROM directory.|[5] The same directory with CHD files inside must be inside the ROM directory.|[6] If desired, the ARTWORK, CHEATS, and SAMPLES directories can be|[^] inside the 'SYSTEMDIR\ume' directory.|[7] When saving, the following directories will be created in the 'SAVEDIR\ume'|[^] directory: STATES, NVRAM, INPUT, SNAPS, CFG, MEMCARD, and DIFF." diff --git a/dist/info/ume2015_libretro.info b/dist/info/ume2015_libretro.info new file mode 100644 index 00000000..7f09b8a6 --- /dev/null +++ b/dist/info/ume2015_libretro.info @@ -0,0 +1,13 @@ +display_name = "Multi (UME 2015)" +authors = "MAMEdev" +supported_extensions = "zip|chd|7z" +corename = "UME 2015 (0.160)" +manufacturer = "Various" +categories = "Emulator" +systemname = "Multi (various)" +systemid = "mame" +license = "MAME" +permissions = "" +display_version = "Git" +supports_no_game = "false" +notes = "[1] UME 2015 (Git) requires the hashes from the MAME/MESS source code|[^] to be inside the 'SYSTEMDIR\ume\hash' directory and softlist romset|(!) [2] UME 2015 supports UME save states.|[3] UME 2015 supports extracted UME cheats.|[4] The BIOS files must be inside the ROM directory.|[5] The same directory with CHD files inside must be inside the ROM directory.|[6] If desired, the ARTWORK, CHEATS, and SAMPLES directories can be|[^] inside the 'SYSTEMDIR\ume' directory.|[7] When saving, the following directories will be created in the 'SAVEDIR\ume'|[^] directory: STATES, NVRAM, INPUT, SNAPS, CFG, MEMCARD, and DIFF." diff --git a/libretro-build-database.sh b/libretro-build-database.sh index ea9b233a..1150e555 100755 --- a/libretro-build-database.sh +++ b/libretro-build-database.sh @@ -329,7 +329,7 @@ build_libretro_databases() { build_libretro_database "MAME 2003 (Midway)" "rom.crc" build_libretro_database "MAME 2003-Plus" "rom.crc" build_libretro_database "MAME 2010" "rom.crc" - build_libretro_database "MAME 2014" "rom.crc" + build_libretro_database "MAME 2015" "rom.crc" build_libretro_database "MAME 2016" "rom.crc" build_libretro_database "FB Alpha - Arcade Games" "rom.crc" build_libretro_database "DOOM" "rom.crc" diff --git a/libretro-build.sh b/libretro-build.sh index c5b6872f..717af8ef 100755 --- a/libretro-build.sh +++ b/libretro-build.sh @@ -114,7 +114,7 @@ build_default_cores_cpp11() { libretro_build_core bsnes_mercury_accuracy libretro_build_core bsnes_mercury_balanced libretro_build_core bsnes_mercury_performance - libretro_build_core mame2014 + libretro_build_core mame2015 libretro_build_core mame2016 libretro_build_core mame } diff --git a/recipes/android/cores-android-armv7-ndk-old-mame b/recipes/android/cores-android-armv7-ndk-old-mame index 0dc9cd92..7e0534a4 100644 --- a/recipes/android/cores-android-armv7-ndk-old-mame +++ b/recipes/android/cores-android-armv7-ndk-old-mame @@ -1,2 +1,2 @@ -mame2014 libretro-mame2014o https://github.com/libretro/mame2014-libretro.git master YES GENERIC Makefile . | mame2014:TARGET=mame mess2014:TARGET=mess ume2014:TARGET=ume +mame2015 libretro-mame2015o https://github.com/libretro/mame2015-libretro.git master YES GENERIC Makefile . | mame2015:TARGET=mame mess2015:TARGET=mess ume2015:TARGET=ume mame2016 libretro-mame2016o https://github.com/libretro/mame2016-libretro master YES GENERIC makefile . OSD=retro RETRO=1 NOWERROR=1 NOASM=1 gcc=android-arm gcc_version=4.9 TARGETOS=android-arm CONFIG=libretro NO_USE_MIDI=1 OS=linux VERBOSE=1 verbose=1 OVERRIDE_CC=/home/buildbot/tools/android/android-ndk-r10e/toolchains/llvm-3.5/prebuilt/linux-x86_64/bin/clang OVERRIDE_CXX=/home/buildbot/tools/android/android-ndk-r10e/toolchains/llvm-3.5/prebuilt/linux-x86_64/bin/clang++ TARGET=mame diff --git a/recipes/apple/cores-ios-generic b/recipes/apple/cores-ios-generic index edfccc5e..324b5a9c 100644 --- a/recipes/apple/cores-ios-generic +++ b/recipes/apple/cores-ios-generic @@ -38,7 +38,7 @@ mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git mas mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master YES GENERIC Makefile . mame2003_plus libretro-mame2003-plus https://github.com/libretro/mame2003-plus-libretro.git master YES GENERIC Makefile . mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git master YES GENERIC Makefile . VRENDER=soft -mame2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git master YES GENERIC Makefile . | mame2014:TARGET=mame mess2014:TARGET=mess ume2014:TARGET=ume +mame2015 libretro-mame2015 https://github.com/libretro/mame2015-libretro.git master YES GENERIC Makefile . | mame2015:TARGET=mame mess2015:TARGET=mess ume2015:TARGET=ume mednafen_gba libretro-beetle_gba https://github.com/libretro/beetle-gba-libretro.git master YES GENERIC Makefile . mednafen_lynx libretro-beetle_lynx https://github.com/libretro/beetle-lynx-libretro.git master YES GENERIC Makefile . mednafen_ngp libretro-beetle_ngp https://github.com/libretro/beetle-ngp-libretro.git master YES GENERIC Makefile . diff --git a/recipes/apple/cores-ios9-generic b/recipes/apple/cores-ios9-generic index 40df0396..700fc4ab 100644 --- a/recipes/apple/cores-ios9-generic +++ b/recipes/apple/cores-ios9-generic @@ -38,7 +38,7 @@ mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git mas mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master YES GENERIC Makefile . mame2003_plus libretro-mame2003-plus https://github.com/libretro/mame2003-plus-libretro.git master YES GENERIC Makefile . mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git master YES GENERIC Makefile . VRENDER=soft -mame2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git master YES GENERIC Makefile . | mame2014:TARGET=mame mess2014:TARGET=mess ume2014:TARGET=ume +mame2015 libretro-mame2015 https://github.com/libretro/mame2015-libretro.git master YES GENERIC Makefile . | mame2015:TARGET=mame mess2015:TARGET=mess ume2015:TARGET=ume mednafen_gba libretro-beetle_gba https://github.com/libretro/beetle-gba-libretro.git master YES GENERIC Makefile . mednafen_lynx libretro-beetle_lynx https://github.com/libretro/beetle-lynx-libretro.git master YES GENERIC Makefile . mednafen_ngp libretro-beetle_ngp https://github.com/libretro/beetle-ngp-libretro.git master YES GENERIC Makefile . diff --git a/recipes/apple/cores-osx-x64-generic b/recipes/apple/cores-osx-x64-generic index 055dabe6..7819b04b 100644 --- a/recipes/apple/cores-osx-x64-generic +++ b/recipes/apple/cores-osx-x64-generic @@ -107,7 +107,7 @@ vice_xplus4 libretro-vice_xplus4 https://github.com/libretro/vice-libretro.git m xrick libretro-xrick https://github.com/libretro/xrick-libretro.git master YES GENERIC Makefile . yabause libretro-yabause https://github.com/libretro/yabause.git master YES GENERIC Makefile libretro kronos libretro-kronos https://github.com/libretro-mirrors/Kronos.git extui-align YES GENERIC Makefile libretro -mame2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git master YES GENERIC Makefile . | mame2014:TARGET=mame mess2014:TARGET=mess ume2014:TARGET=ume +mame2015 libretro-mame2015 https://github.com/libretro/mame2015-libretro.git master YES GENERIC Makefile . | mame2015:TARGET=mame mess2015:TARGET=mess ume2015:TARGET=ume uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile . gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile . 81 libretro-81 https://github.com/libretro/81-libretro.git master YES GENERIC Makefile . diff --git a/recipes/blackberry/cores-qnx-generic b/recipes/blackberry/cores-qnx-generic index 1f92e099..7b886060 100644 --- a/recipes/blackberry/cores-qnx-generic +++ b/recipes/blackberry/cores-qnx-generic @@ -25,7 +25,7 @@ mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git mas mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master YES GENERIC Makefile . mame2003_plus libretro-mame2003-plus https://github.com/libretro/mame2003-plus-libretro.git master YES GENERIC Makefile . mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git master YES GENERIC Makefile . VRENDER=soft -mame2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git master YES GENERIC Makefile . | mame2014:TARGET=mame mess2014:TARGET=mess ume2014:TARGET=ume +mame2015 libretro-mame2015 https://github.com/libretro/mame2015-libretro.git master YES GENERIC Makefile . | mame2015:TARGET=mame mess2015:TARGET=mess ume2015:TARGET=ume mednafen_gba libretro-beetle_gba https://github.com/libretro/beetle-gba-libretro.git master YES GENERIC Makefile . mednafen_lynx libretro-beetle_lynx https://github.com/libretro/beetle-lynx-libretro.git master YES GENERIC Makefile . mednafen_ngp libretro-beetle_ngp https://github.com/libretro/beetle-ngp-libretro.git master YES GENERIC Makefile . diff --git a/recipes/linux/cores-linux-x64-generic b/recipes/linux/cores-linux-x64-generic index f92374b7..e22885dd 100644 --- a/recipes/linux/cores-linux-x64-generic +++ b/recipes/linux/cores-linux-x64-generic @@ -52,7 +52,7 @@ mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git mas mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master YES GENERIC Makefile . mame2003_plus libretro-mame2003-plus https://github.com/libretro/mame2003-plus-libretro.git master YES GENERIC Makefile . mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git master YES GENERIC Makefile . VRENDER=soft PTR64=1 -mame2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git master YES GENERIC Makefile . PTR64=1 | mame2014:TARGET=mame mess2014:TARGET=mess ume2014:TARGET=ume +mame2015 libretro-mame2015 https://github.com/libretro/mame2015-libretro.git master YES GENERIC Makefile . PTR64=1 | mame2015:TARGET=mame mess2015:TARGET=mess ume2015:TARGET=ume mame2016 libretro-mame2016 https://github.com/libretro/mame2016-libretro.git master YES GENERIC Makefile.libretro . PTR64=1 mednafen_gba libretro-beetle_gba https://github.com/libretro/beetle-gba-libretro.git master YES GENERIC Makefile . mednafen_lynx libretro-beetle_lynx https://github.com/libretro/beetle-lynx-libretro.git master YES GENERIC Makefile . diff --git a/recipes/linux/cores-linux-x86-generic b/recipes/linux/cores-linux-x86-generic index 8a119cd8..9a2cee23 100644 --- a/recipes/linux/cores-linux-x86-generic +++ b/recipes/linux/cores-linux-x86-generic @@ -47,7 +47,7 @@ mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git mas mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master YES GENERIC Makefile . mame2003_plus libretro-mame2003-plus https://github.com/libretro/mame2003-plus-libretro.git master YES GENERIC Makefile . mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git master YES GENERIC Makefile . VRENDER=soft PTR64=0 -mame2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git master YES GENERIC Makefile . PTR64=0 | mame2014:TARGET=mame mess2014:TARGET=mess ume2014:TARGET=ume +mame2015 libretro-mame2015 https://github.com/libretro/mame2015-libretro.git master YES GENERIC Makefile . PTR64=0 | mame2015:TARGET=mame mess2015:TARGET=mess ume2015:TARGET=ume mame2016 libretro-mame2016 https://github.com/libretro/mame2016-libretro.git master YES GENERIC Makefile.libretro . PTR64=0 mednafen_gba libretro-beetle_gba https://github.com/libretro/beetle-gba-libretro.git master YES GENERIC Makefile . mednafen_lynx libretro-beetle_lynx https://github.com/libretro/beetle-lynx-libretro.git master YES GENERIC Makefile . diff --git a/recipes/windows/cores-windows-x64_seh-generic b/recipes/windows/cores-windows-x64_seh-generic index 6939a47a..ba6da49d 100644 --- a/recipes/windows/cores-windows-x64_seh-generic +++ b/recipes/windows/cores-windows-x64_seh-generic @@ -50,7 +50,7 @@ mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git mas mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master YES GENERIC Makefile . CCACHE_DISABLE=1 mame2003_plus libretro-mame2003-plus https://github.com/libretro/mame2003-plus-libretro.git master YES GENERIC Makefile . CCACHE_DISABLE=1 mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git master YES GENERIC Makefile . VRENDER=soft PTR64=1 -mame2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git master YES GENERIC Makefile . CCACHE_DISABLE=1 PTR64=1 | mame2014:TARGET=mame mess2014:TARGET=mess ume2014:TARGET=ume +mame2015 libretro-mame2015 https://github.com/libretro/mame2015-libretro.git master YES GENERIC Makefile . CCACHE_DISABLE=1 PTR64=1 | mame2015:TARGET=mame mess2015:TARGET=mess ume2015:TARGET=ume mame2016 libretro-mame2016 https://github.com/libretro/mame2016-libretro.git master YES GENERIC Makefile.libretro . PTR64=1 mednafen_gba libretro-beetle_gba https://github.com/libretro/beetle-gba-libretro.git master YES GENERIC Makefile . mednafen_lynx libretro-beetle_lynx https://github.com/libretro/beetle-lynx-libretro.git master YES GENERIC Makefile . diff --git a/recipes/windows/cores-windows-x86_dw2-generic b/recipes/windows/cores-windows-x86_dw2-generic index 0a7f2514..3195ffa1 100644 --- a/recipes/windows/cores-windows-x86_dw2-generic +++ b/recipes/windows/cores-windows-x86_dw2-generic @@ -48,7 +48,7 @@ mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git mas mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master YES GENERIC Makefile . mame2003_plus libretro-mame2003-plus https://github.com/libretro/mame2003-plus-libretro.git master YES GENERIC Makefile . mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git master YES GENERIC Makefile . VRENDER=soft PTR64=0 -mame2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git master YES GENERIC Makefile . PTR64=0 | mame2014:TARGET=mame mess2014:TARGET=mess ume2014:TARGET=ume +mame2015 libretro-mame2015 https://github.com/libretro/mame2015-libretro.git master YES GENERIC Makefile . PTR64=0 | mame2015:TARGET=mame mess2015:TARGET=mess ume2015:TARGET=ume mame2016 libretro-mame2016 https://github.com/libretro/mame2016-libretro master YES GENERIC Makefile.libretro . PTR64=0 mednafen_gba libretro-beetle_gba https://github.com/libretro/beetle-gba-libretro.git master YES GENERIC Makefile . mednafen_lynx libretro-beetle_lynx https://github.com/libretro/beetle-lynx-libretro.git master YES GENERIC Makefile . diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh index 8f42324d..b53fe6ba 100644 --- a/rules.d/core-rules.sh +++ b/rules.d/core-rules.sh @@ -623,12 +623,12 @@ libretro_mame2010_name="MAME 2010 (0.139)" libretro_mame2010_git_url="https://github.com/libretro/mame2010-libretro.git" libretro_mame2010_makefile="Makefile" -include_core_mame2014() { - register_module core "mame2014" -theos_ios -ngc -psp1 -wii +include_core_mame2015() { + register_module core "mame2015" -theos_ios -ngc -psp1 -wii } -libretro_mame2014_name="MAME 2014 (0.159)" -libretro_mame2014_git_url="https://github.com/libretro/mame2014-libretro.git" -libretro_mame2014_makefile="Makefile" +libretro_mame2015_name="MAME 2015 (0.160)" +libretro_mame2015_git_url="https://github.com/libretro/mame2015-libretro.git" +libretro_mame2015_makefile="Makefile" include_core_mame2016() { register_module core "mame2016" -theos_ios -ngc -psp1 -wii