From 341b6fba38ce06d53d212540900ced534a2dc533 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 17 Jun 2017 01:42:24 -0400 Subject: [PATCH 1/3] Update MAME databases for targetted MAME versions --- dist/info/mame2000_libretro.info | 2 +- dist/info/mame2003_libretro.info | 2 +- dist/info/mame2003_midway_libretro.info | 2 +- dist/info/mame2010_libretro.info | 2 +- dist/info/mame2014_libretro.info | 2 +- dist/info/mame2016_libretro.info | 2 +- libretro-build-database.sh | 18 ++++++++++++++++-- 7 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dist/info/mame2000_libretro.info b/dist/info/mame2000_libretro.info index 98a7ee2e..6dd1d9b9 100644 --- a/dist/info/mame2000_libretro.info +++ b/dist/info/mame2000_libretro.info @@ -5,7 +5,7 @@ corename = "MAME 2000 (0.37b5)" manufacturer = "Various" categories = "Emulator" systemname = "Arcade (various)" -database = "MAME" +database = "MAME 0.37b5" license = "MAME" permissions = "" display_version = "0.37b5" diff --git a/dist/info/mame2003_libretro.info b/dist/info/mame2003_libretro.info index 320f6dd3..4be594d7 100644 --- a/dist/info/mame2003_libretro.info +++ b/dist/info/mame2003_libretro.info @@ -5,7 +5,7 @@ corename = "MAME 2003 (0.78)" manufacturer = "Various" categories = "Emulator" systemname = "Arcade (various)" -database = "MAME2003" +database = "MAME 0.78" license = "MAME" permissions = "" display_version = "0.78" diff --git a/dist/info/mame2003_midway_libretro.info b/dist/info/mame2003_midway_libretro.info index a0f77c8d..e9d91a5e 100644 --- a/dist/info/mame2003_midway_libretro.info +++ b/dist/info/mame2003_midway_libretro.info @@ -5,7 +5,7 @@ corename = "MAME 2003 Midway (0.78)" manufacturer = "Various" categories = "Emulator" systemname = "Arcade (various)" -database = "MAME2003" +database = "MAME 0.78" license = "MAME" permissions = "" display_version = "0.78" diff --git a/dist/info/mame2010_libretro.info b/dist/info/mame2010_libretro.info index 08180be3..ba1c653d 100644 --- a/dist/info/mame2010_libretro.info +++ b/dist/info/mame2010_libretro.info @@ -5,7 +5,7 @@ corename = "MAME 2010 (0.139)" manufacturer = "Various" categories = "Emulator" systemname = "Arcade (various)" -database = "MAME" +database = "MAME 0.139" license = "MAME" permissions = "" display_version = "0.139" diff --git a/dist/info/mame2014_libretro.info b/dist/info/mame2014_libretro.info index 8ea1dddf..ccbaa6cb 100644 --- a/dist/info/mame2014_libretro.info +++ b/dist/info/mame2014_libretro.info @@ -5,7 +5,7 @@ corename = "MAME 2014 (0.159)" manufacturer = "Various" categories = "Emulator" systemname = "Arcade (various)" -database = "MAME" +database = "MAME 0.159" license = "MAME" permissions = "" display_version = "0.159" diff --git a/dist/info/mame2016_libretro.info b/dist/info/mame2016_libretro.info index 0d37aa2d..65a3484d 100644 --- a/dist/info/mame2016_libretro.info +++ b/dist/info/mame2016_libretro.info @@ -5,7 +5,7 @@ corename = "MAME 2016 (0.174)" manufacturer = "Various" categories = "Emulator" systemname = "Arcade (various)" -database = "MAME" +database = "MAME 0.174" license = "MAME" permissions = "" display_version = "0.174" diff --git a/libretro-build-database.sh b/libretro-build-database.sh index 5e65693f..1b83eaa8 100755 --- a/libretro-build-database.sh +++ b/libretro-build-database.sh @@ -170,6 +170,17 @@ build_libretro_database() { COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/hacks/${1}.dat"' fi + #Check for the MAME folders + if [ -f "${LIBRETRODATABASE_META_DAT_DIR}/mame-nonmerged/${1}.dat" ]; then + COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/mame-nonmerged/${1}.dat"' + fi + if [ -f "${LIBRETRODATABASE_META_DAT_DIR}/mame-split/${1}.dat" ]; then + COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/mame-split/${1}.dat"' + fi + if [ -f "${LIBRETRODATABASE_META_DAT_DIR}/mame/${1}.dat" ]; then + COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/mame/${1}.dat"' + fi + #Check if meta libretro-dats folder is there if [ -f "${LIBRETRODATABASE_META_DAT_DIR}/libretro-dats/${1}.dat" ]; then COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/libretro-dats/${1}.dat"' @@ -289,8 +300,11 @@ build_libretro_databases() { build_libretro_database "VTech - CreatiVision" "rom.crc" build_libretro_database "VTech - V.Smile" "rom.crc" build_libretro_database "Watara - Supervision" "rom.crc" - build_libretro_database "MAME" "rom.name" - build_libretro_database "MAME2003" "rom.name" + build_libretro_database "MAME" "rom.crc" + build_libretro_database "MAME 0.139" "rom.crc" + build_libretro_database "MAME 0.159" "rom.crc" + build_libretro_database "MAME 0.37b5" "rom.crc" + build_libretro_database "MAME 0.078" "rom.crc" build_libretro_database "FB Alpha - Arcade Games" "rom.name" build_libretro_database "DOOM" "rom.crc" build_libretro_database "Cave Story" "rom.crc" From fcf7a16e0019f51334afe130094377e6c53d7dc0 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sun, 18 Jun 2017 17:02:46 -0400 Subject: [PATCH 2/3] Fix MAME 0.78 version --- libretro-build-database.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libretro-build-database.sh b/libretro-build-database.sh index 1b83eaa8..39e9c3a2 100755 --- a/libretro-build-database.sh +++ b/libretro-build-database.sh @@ -304,7 +304,7 @@ build_libretro_databases() { build_libretro_database "MAME 0.139" "rom.crc" build_libretro_database "MAME 0.159" "rom.crc" build_libretro_database "MAME 0.37b5" "rom.crc" - build_libretro_database "MAME 0.078" "rom.crc" + build_libretro_database "MAME 0.78" "rom.crc" build_libretro_database "FB Alpha - Arcade Games" "rom.name" build_libretro_database "DOOM" "rom.crc" build_libretro_database "Cave Story" "rom.crc" From 27f19c51a4a66ef1df0ea588cd423839ba895468 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Thu, 22 Jun 2017 12:26:47 -0400 Subject: [PATCH 3/3] Add MAME 0.174 DAT --- libretro-build-database.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libretro-build-database.sh b/libretro-build-database.sh index 39e9c3a2..1d52ee53 100755 --- a/libretro-build-database.sh +++ b/libretro-build-database.sh @@ -301,10 +301,11 @@ build_libretro_databases() { build_libretro_database "VTech - V.Smile" "rom.crc" build_libretro_database "Watara - Supervision" "rom.crc" build_libretro_database "MAME" "rom.crc" - build_libretro_database "MAME 0.139" "rom.crc" - build_libretro_database "MAME 0.159" "rom.crc" build_libretro_database "MAME 0.37b5" "rom.crc" build_libretro_database "MAME 0.78" "rom.crc" + build_libretro_database "MAME 0.139" "rom.crc" + build_libretro_database "MAME 0.159" "rom.crc" + build_libretro_database "MAME 0.174" "rom.crc" build_libretro_database "FB Alpha - Arcade Games" "rom.name" build_libretro_database "DOOM" "rom.crc" build_libretro_database "Cave Story" "rom.crc"