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/machine.lua | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'scripts/src/machine.lua')
-rw-r--r-- | scripts/src/machine.lua | 57 |
1 files changed, 43 insertions, 14 deletions
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index 4e74fd9e6c3..fa451ae5dc6 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -2622,6 +2622,12 @@ 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 @@ -2912,38 +2918,37 @@ end --------------------------------------------------- -- ---@src/devices/machine/wd11c00_17.h,MACHINES["WD11C00_17"] = true +--@src/devices/machine/wd1010.h,MACHINES["WD1010"] = true --------------------------------------------------- -if (MACHINES["WD11C00_17"]~=null) then +if (MACHINES["WD1010"]~=null) then files { - MAME_DIR .. "src/devices/machine/wd11c00_17.cpp", - MAME_DIR .. "src/devices/machine/wd11c00_17.h", + MAME_DIR .. "src/devices/machine/wd1010.cpp", + MAME_DIR .. "src/devices/machine/wd1010.h", } end --------------------------------------------------- -- ---@src/devices/machine/wd2010.h,MACHINES["WD2010"] = true +--@src/devices/machine/wd11c00_17.h,MACHINES["WD11C00_17"] = true --------------------------------------------------- -if (MACHINES["WD2010"]~=null) then +if (MACHINES["WD11C00_17"]~=null) then files { - MAME_DIR .. "src/devices/machine/wd2010.cpp", - MAME_DIR .. "src/devices/machine/wd2010.h", + MAME_DIR .. "src/devices/machine/wd11c00_17.cpp", + MAME_DIR .. "src/devices/machine/wd11c00_17.h", } end --------------------------------------------------- -- ---@src/devices/machine/wd33c93.h,MACHINES["WD33C93"] = true +--@src/devices/machine/wd2010.h,MACHINES["WD2010"] = true --------------------------------------------------- -if (MACHINES["WD33C93"]~=null) then - MACHINES["SCSI"] = true +if (MACHINES["WD2010"]~=null) then files { - MAME_DIR .. "src/devices/machine/wd33c93.cpp", - MAME_DIR .. "src/devices/machine/wd33c93.h", + MAME_DIR .. "src/devices/machine/wd2010.cpp", + MAME_DIR .. "src/devices/machine/wd2010.h", } end @@ -3867,4 +3872,28 @@ if (MACHINES["DC7085"]~=null) then MAME_DIR .. "src/devices/machine/dc7085.cpp", MAME_DIR .. "src/devices/machine/dc7085.h", } -end
\ No newline at end of file +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 |