Merge branch 'master' into downloadplay

This commit is contained in:
Rob Loach 2017-02-20 14:53:00 -05:00 committed by GitHub
commit 8326a86480
3 changed files with 9 additions and 4 deletions

View File

@ -5,7 +5,7 @@ corename = "DeSmuME"
manufacturer = "Nintendo"
categories = "Emulator"
systemname = "Nintendo DS"
database = "Nintendo - Nintendo DS Decrypted|Nintendo - Nintendo DS (Download Play)"
database = "Nintendo - Nintendo DS|Nintendo - Nintendo DS Decrypted|Nintendo - Nintendo DS (Download Play)"
license = "GPLv2"
permissions = ""
display_version = "SVN"

View File

@ -5,7 +5,7 @@ corename = "melonDS"
manufacturer = "Nintendo"
categories = "Emulator"
systemname = "Nintendo DS"
database = "Nintendo - Nintendo DS Decrypted|Nintendo - Nintendo DS (Download Play)"
database = "Nintendo - Nintendo DS|Nintendo - Nintendo DS Decrypted|Nintendo - Nintendo DS (Download Play)"
license = "GPLv2"
permissions = ""
display_version = "Git"

View File

@ -165,6 +165,11 @@ build_libretro_database() {
COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/tgdb/${1}.dat"'
fi
#Check if meta hacks is there
if [ -f "${LIBRETRODATABASE_META_DAT_DIR}/hacks/${1}.dat" ]; then
COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/hacks/${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"'
@ -238,9 +243,9 @@ build_libretro_databases() {
build_libretro_database "Nintendo - GameCube" "rom.crc"
build_libretro_database "Nintendo - Nintendo 3DS" "rom.crc"
build_libretro_database "Nintendo - Nintendo 3DS (DLC)" "rom.crc"
build_libretro_database "Nintendo - Nintendo DS Decrypted" "rom.crc"
build_libretro_database "Nintendo - Nintendo DS" "rom.crc"
build_libretro_database "Nintendo - Nintendo DS (Download Play)" "rom.crc"
build_libretro_database "Nintendo - Nintendo DSi Decrypted" "rom.crc"
build_libretro_database "Nintendo - Nintendo DSi" "rom.crc"
build_libretro_database "Nintendo - Nintendo DSi (DLC)" "rom.crc"
build_libretro_database "Nintendo - Nintendo Entertainment System" "rom.crc"
build_libretro_database "Nintendo - Nintendo Wii (DLC)" "rom.crc"