From faf0417271f0fa541bdc17f27b0fad8e107cee64 Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Tue, 2 Mar 2021 20:19:59 +0100 Subject: [PATCH] defaults: pc format is in, ipf is out --- scripts/src/formats.lua | 12 ++++++------ scripts/target/mame/arcade.lua | 1 - scripts/target/mame/mess.lua | 8 ++++---- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/scripts/src/formats.lua b/scripts/src/formats.lua index a3decee1833..5803229b943 100644 --- a/scripts/src/formats.lua +++ b/scripts/src/formats.lua @@ -56,8 +56,8 @@ project "formats" MAME_DIR .. "src/lib/formats/mfi_dsk.h", MAME_DIR .. "src/lib/formats/imd_dsk.cpp", MAME_DIR .. "src/lib/formats/imd_dsk.h", - MAME_DIR .. "src/lib/formats/ipf_dsk.cpp", - MAME_DIR .. "src/lib/formats/ipf_dsk.h", + MAME_DIR .. "src/lib/formats/pc_dsk.cpp", + MAME_DIR .. "src/lib/formats/pc_dsk.h", MAME_DIR .. "src/lib/formats/d88_dsk.cpp", MAME_DIR .. "src/lib/formats/d88_dsk.h", MAME_DIR .. "src/lib/formats/dfi_dsk.cpp", @@ -1484,13 +1484,13 @@ end -------------------------------------------------- -- ---@src/lib/formats/pc_dsk.h,FORMATS["PC_DSK"] = true +--@src/lib/formats/ipf_dsk.h,FORMATS["IPF_DSK"] = true -------------------------------------------------- -if (FORMATS["PC_DSK"]~=null or _OPTIONS["with-tools"]) then +if (FORMATS["IPF_DSK"]~=null or _OPTIONS["with-tools"]) then files { - MAME_DIR.. "src/lib/formats/pc_dsk.cpp", - MAME_DIR.. "src/lib/formats/pc_dsk.h", + MAME_DIR.. "src/lib/formats/ipf_dsk.cpp", + MAME_DIR.. "src/lib/formats/ipf_dsk.h", } end diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index f63bb1b1226..2d303879b0f 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -851,7 +851,6 @@ FORMATS["SC3000_BIT"] = true FORMATS["WD177X_DSK"] = true FORMATS["NASLITE_DSK"] = true FORMATS["UPD765_DSK"] = true -FORMATS["PC_DSK"] = true FORMATS["BASICDSK"] = true FORMATS["IBMXDF_DSK"] = true diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index a458adbca9e..e54c6f9bf97 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -1062,17 +1062,17 @@ FORMATS["H8_CAS"] = true FORMATS["HECTOR_MINIDISC"] = true FORMATS["HECT_DSK"] = true FORMATS["HECT_TAP"] = true -FORMATS["HTI_TAP"] = true FORMATS["HPI_DSK"] = true FORMATS["HP_IPC_DSK"] = true +FORMATS["HTI_TAP"] = true FORMATS["IBMXDF_DSK"] = true FORMATS["IMG_DSK"] = true +FORMATS["IPF_DSK"] = true FORMATS["IQ151_DSK"] = true FORMATS["ITT3030_DSK"] = true FORMATS["JFD_DSK"] = true FORMATS["JUKU_DSK"] = true FORMATS["JVC_DSK"] = true -FORMATS["OS9_DSK"] = true FORMATS["KAYPRO_DSK"] = true FORMATS["KC85_DSK"] = true FORMATS["KC_CAS"] = true @@ -1097,17 +1097,17 @@ FORMATS["OPD_DSK"] = true FORMATS["ORAO_CAS"] = true FORMATS["ORIC_DSK"] = true FORMATS["ORIC_TAP"] = true +FORMATS["OS9_DSK"] = true FORMATS["P2000T_CAS"] = true FORMATS["P6001_CAS"] = true FORMATS["PASTI_DSK"] = true FORMATS["PC98FDI_DSK"] = true FORMATS["PC98_DSK"] = true -FORMATS["PC_DSK"] = true FORMATS["PHC25_CAS"] = true FORMATS["PK8020_DSK"] = true +FORMATS["PMD_CAS"] = true FORMATS["POLY_DSK"] = true FORMATS["PPG_DSK"] = true -FORMATS["PMD_CAS"] = true FORMATS["PRIMOPTP"] = true FORMATS["PYLDIN_DSK"] = true FORMATS["QL_DSK"] = true