summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/machine.lua
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /scripts/src/machine.lua
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'scripts/src/machine.lua')
-rw-r--r--scripts/src/machine.lua57
1 files changed, 14 insertions, 43 deletions
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
@@ -2918,18 +2912,6 @@ 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
---------------------------------------------------
@@ -2954,6 +2936,19 @@ 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