Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-16 21:44:32 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix messed-up merge

Browse Source
This commit is contained in:
Olivier Galibert 2021-03-05 14:10:44 +01:00
parent e0da4a9f27
commit e8ab2b8a78
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/src/formats.lua
View File

@ -1603,10 +1603,10 @@ end
-------------------------------------------------- --------------------------------------------------
-- --
--@src/lib/formats/rc759_dsk.h,FORMATS["RC759"] = true --@src/lib/formats/rc759_dsk.h,FORMATS["RC759_DSK"] = true
-------------------------------------------------- --------------------------------------------------
if (FORMATS["APRIDISK"]~=null or _OPTIONS["with-tools"]) then if opt_tool(FORMATS, "RC759_DSK") then
files { files {
MAME_DIR.. "src/lib/formats/rc759_dsk.cpp", MAME_DIR.. "src/lib/formats/rc759_dsk.cpp",
MAME_DIR.. "src/lib/formats/rc759_dsk.h", MAME_DIR.. "src/lib/formats/rc759_dsk.h",

5
scripts/target/mame/mess.lua
View File

@ -981,7 +981,6 @@ BUSES["X68K"] = true
BUSES["Z29_KBD"] = true BUSES["Z29_KBD"] = true
BUSES["Z88"] = true BUSES["Z88"] = true
BUSES["ZORRO"] = true BUSES["ZORRO"] = true
BUSES["THOMSON"] = true
-------------------------------------------------- --------------------------------------------------
-- specify used file formats -- specify used file formats
@ -1112,7 +1111,7 @@ FORMATS["PPG_DSK"] = true
FORMATS["PRIMOPTP"] = true FORMATS["PRIMOPTP"] = true
FORMATS["PYLDIN_DSK"] = true FORMATS["PYLDIN_DSK"] = true
FORMATS["QL_DSK"] = true FORMATS["QL_DSK"] = true
FORMATS["RC759"] = true FORMATS["RC759_DSK"] = true
FORMATS["RK_CAS"] = true FORMATS["RK_CAS"] = true
FORMATS["RX50_DSK"] = true FORMATS["RX50_DSK"] = true
FORMATS["SC3000_BIT"] = true FORMATS["SC3000_BIT"] = true
@ -3930,6 +3929,8 @@ files {
MAME_DIR .. "src/mame/drivers/thomson.cpp", MAME_DIR .. "src/mame/drivers/thomson.cpp",
MAME_DIR .. "src/mame/includes/thomson.h", MAME_DIR .. "src/mame/includes/thomson.h",
MAME_DIR .. "src/mame/machine/thomson.cpp", MAME_DIR .. "src/mame/machine/thomson.cpp",
MAME_DIR .. "src/mame/machine/thomflop.cpp",
MAME_DIR .. "src/mame/machine/thomflop.h",
MAME_DIR .. "src/mame/video/thomson.cpp", MAME_DIR .. "src/mame/video/thomson.cpp",
} }