diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /scripts/src/formats.lua | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'scripts/src/formats.lua')
-rw-r--r-- | scripts/src/formats.lua | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/scripts/src/formats.lua b/scripts/src/formats.lua index 9e7a2a1eb5a..b25909dbb3a 100644 --- a/scripts/src/formats.lua +++ b/scripts/src/formats.lua @@ -1147,18 +1147,6 @@ 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 -------------------------------------------------- @@ -1231,18 +1219,6 @@ 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 -------------------------------------------------- |