From b380514764cf857469bae61c11143a19f79a74c5 Mon Sep 17 00:00:00 2001 From: andreasnaive Date: Mon, 25 Mar 2019 23:13:40 +0100 Subject: Revert "conflict resolution (nw)" This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705. --- scripts/src/formats.lua | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'scripts/src/formats.lua') 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 @@ -1145,18 +1145,6 @@ if (FORMATS["MSX_DSK"]~=null or _OPTIONS["with-tools"]) then } 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 @@ -1229,18 +1217,6 @@ if (FORMATS["NFD_DSK"]~=null or _OPTIONS["with-tools"]) then } 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 -- cgit v1.2.3-70-g09d2