diff options
author | 2019-03-25 22:44:58 +0100 | |
---|---|---|
committer | 2019-03-25 22:44:58 +0100 | |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /scripts/src/formats.lua | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'scripts/src/formats.lua')
-rw-r--r-- | scripts/src/formats.lua | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/scripts/src/formats.lua b/scripts/src/formats.lua index b25909dbb3a..9e7a2a1eb5a 100644 --- a/scripts/src/formats.lua +++ b/scripts/src/formats.lua @@ -1147,6 +1147,18 @@ end -------------------------------------------------- -- +--@src/lib/formats/mtx_dsk.h,FORMATS["MTX_DSK"] = true +-------------------------------------------------- + +if (FORMATS["MTX_DSK"]~=null or _OPTIONS["with-tools"]) then + files { + MAME_DIR.. "src/lib/formats/mtx_dsk.cpp", + MAME_DIR.. "src/lib/formats/mtx_dsk.h", + } +end + +-------------------------------------------------- +-- --@src/lib/formats/mz_cas.h,FORMATS["MZ_CAS"] = true -------------------------------------------------- @@ -1219,6 +1231,18 @@ end -------------------------------------------------- -- +--@src/lib/formats/opd_dsk.h,FORMATS["OPD_DSK"] = true +-------------------------------------------------- + +if (FORMATS["OPD_DSK"]~=null or _OPTIONS["with-tools"]) then + files { + MAME_DIR.. "src/lib/formats/opd_dsk.cpp", + MAME_DIR.. "src/lib/formats/opd_dsk.h", + } +end + +-------------------------------------------------- +-- --@src/lib/formats/orao_cas.h,FORMATS["ORAO_CAS"] = true -------------------------------------------------- |