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/machine.lua | 57 ++++++++++++------------------------------------- 1 file changed, 14 insertions(+), 43 deletions(-) (limited to 'scripts/src/machine.lua') diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index fa451ae5dc6..4e74fd9e6c3 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -2622,12 +2622,6 @@ if (MACHINES["SPG2XX"]~=null) then files { MAME_DIR .. "src/devices/machine/spg2xx.cpp", MAME_DIR .. "src/devices/machine/spg2xx.h", - MAME_DIR .. "src/devices/machine/spg2xx_audio.cpp", - MAME_DIR .. "src/devices/machine/spg2xx_audio.h", - MAME_DIR .. "src/devices/machine/spg2xx_io.cpp", - MAME_DIR .. "src/devices/machine/spg2xx_io.h", - MAME_DIR .. "src/devices/machine/spg110.cpp", - MAME_DIR .. "src/devices/machine/spg110.h", } end @@ -2916,18 +2910,6 @@ if (MACHINES["WD_FDC"]~=null) then } end ---------------------------------------------------- --- ---@src/devices/machine/wd1010.h,MACHINES["WD1010"] = true ---------------------------------------------------- - -if (MACHINES["WD1010"]~=null) then - files { - MAME_DIR .. "src/devices/machine/wd1010.cpp", - MAME_DIR .. "src/devices/machine/wd1010.h", - } -end - --------------------------------------------------- -- --@src/devices/machine/wd11c00_17.h,MACHINES["WD11C00_17"] = true @@ -2952,6 +2934,19 @@ if (MACHINES["WD2010"]~=null) then } end +--------------------------------------------------- +-- +--@src/devices/machine/wd33c93.h,MACHINES["WD33C93"] = true +--------------------------------------------------- + +if (MACHINES["WD33C93"]~=null) then + MACHINES["SCSI"] = true + files { + MAME_DIR .. "src/devices/machine/wd33c93.cpp", + MAME_DIR .. "src/devices/machine/wd33c93.h", + } +end + --------------------------------------------------- -- --@src/devices/machine/wd33c9x.h,MACHINES["WD33C9X"] = true @@ -3872,28 +3867,4 @@ if (MACHINES["DC7085"]~=null) then MAME_DIR .. "src/devices/machine/dc7085.cpp", MAME_DIR .. "src/devices/machine/dc7085.h", } -end - ---------------------------------------------------- --- ---@src/devices/machine/i82357.h,MACHINES["I82357"] = true ---------------------------------------------------- - -if (MACHINES["I82357"]~=null) then - files { - MAME_DIR .. "src/devices/machine/i82357.cpp", - MAME_DIR .. "src/devices/machine/i82357.h", - } -end - ---------------------------------------------------- --- ---@src/devices/machine/xc1700e.h,MACHINES["XC1700E"] = true ---------------------------------------------------- - -if (MACHINES["XC1700E"]~=null) then - files { - MAME_DIR .. "src/devices/machine/xc1700e.cpp", - MAME_DIR .. "src/devices/machine/xc1700e.h", - } -end +end \ No newline at end of file -- cgit v1.2.3-70-g09d2