diff options
author | 2015-07-06 04:28:33 +0200 | |
---|---|---|
committer | 2015-07-06 04:28:33 +0200 | |
commit | a580faf7083cdc7c2c66f9610743bf3144119360 (patch) | |
tree | 6ca4cab87e01357c3141c30113bdc116cc044f17 /scripts/src | |
parent | 5da7919cde55e1c69edbb9862cf2a6428ab771c5 (diff) | |
parent | e3e03e67d19353500ed4da484f443e71f2a25fc0 (diff) |
Merge pull request #4 from mamedev/master
merge with base
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/bus.lua | 2 | ||||
-rw-r--r-- | scripts/src/cpu.lua | 55 | ||||
-rw-r--r-- | scripts/src/emu.lua | 1 | ||||
-rw-r--r-- | scripts/src/machine.lua | 13 | ||||
-rw-r--r-- | scripts/src/netlist.lua | 2 | ||||
-rw-r--r-- | scripts/src/video.lua | 12 |
6 files changed, 56 insertions, 29 deletions
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 2a2ccd54776..8638af2e780 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -2134,6 +2134,8 @@ if (BUSES["CPC"]~=null) then MAME_DIR .. "src/emu/bus/cpc/brunword4.h", MAME_DIR .. "src/emu/bus/cpc/hd20.c", MAME_DIR .. "src/emu/bus/cpc/hd20.h", + MAME_DIR .. "src/emu/bus/cpc/ddi1.c", + MAME_DIR .. "src/emu/bus/cpc/ddi1.h", } end diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index e7c7df256d8..ddbcfb768ab 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -164,6 +164,7 @@ if (CPUS["AMIS2000"]~=null) then files { MAME_DIR .. "src/emu/cpu/amis2000/amis2000.c", MAME_DIR .. "src/emu/cpu/amis2000/amis2000.h", + MAME_DIR .. "src/emu/cpu/amis2000/amis2000op.c", } end @@ -583,6 +584,7 @@ if (CPUS["HMCS40"]~=null) then files { MAME_DIR .. "src/emu/cpu/hmcs40/hmcs40.c", MAME_DIR .. "src/emu/cpu/hmcs40/hmcs40.h", + MAME_DIR .. "src/emu/cpu/hmcs40/hmcs40op.c", } end @@ -1076,6 +1078,7 @@ if (CPUS["MELPS4"]~=null) then files { MAME_DIR .. "src/emu/cpu/melps4/melps4.c", MAME_DIR .. "src/emu/cpu/melps4/melps4.h", + MAME_DIR .. "src/emu/cpu/melps4/melps4op.c", MAME_DIR .. "src/emu/cpu/melps4/m58846.c", MAME_DIR .. "src/emu/cpu/melps4/m58846.h", } @@ -1467,6 +1470,7 @@ if (CPUS["UCOM4"]~=null) then files { MAME_DIR .. "src/emu/cpu/ucom4/ucom4.c", MAME_DIR .. "src/emu/cpu/ucom4/ucom4.h", + MAME_DIR .. "src/emu/cpu/ucom4/ucom4op.c", } end @@ -1546,6 +1550,41 @@ if (CPUS["SATURN"]~=null or _OPTIONS["with-tools"]) then end -------------------------------------------------- +-- Sharp SM510 series +--@src/emu/cpu/sm510/sm510.h,CPUS["SM510"] = true +-------------------------------------------------- + +if (CPUS["SM510"]~=null) then + files { + MAME_DIR .. "src/emu/cpu/sm510/sm510.c", + MAME_DIR .. "src/emu/cpu/sm510/sm510.h", + MAME_DIR .. "src/emu/cpu/sm510/sm510op.c", + MAME_DIR .. "src/emu/cpu/sm510/sm510core.c", + MAME_DIR .. "src/emu/cpu/sm510/sm511core.c", + } +end + +if (CPUS["SM510"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/emu/cpu/sm510/sm510d.c") +end + +-------------------------------------------------- +-- Sharp SM8500 +--@src/emu/cpu/sm8500/sm8500.h,CPUS["SM8500"] = true +-------------------------------------------------- + +if (CPUS["SM8500"]~=null) then + files { + MAME_DIR .. "src/emu/cpu/sm8500/sm8500.c", + MAME_DIR .. "src/emu/cpu/sm8500/sm8500.h", + } +end + +if (CPUS["SM8500"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/emu/cpu/sm8500/sm8500d.c") +end + +-------------------------------------------------- -- Signetics 2650 --@src/emu/cpu/s2650/s2650.h,CPUS["S2650"] = true -------------------------------------------------- @@ -1578,22 +1617,6 @@ if (CPUS["SC61860"]~=null or _OPTIONS["with-tools"]) then end -------------------------------------------------- --- SM8500 ---@src/emu/cpu/sm8500/sm8500.h,CPUS["SM8500"] = true --------------------------------------------------- - -if (CPUS["SM8500"]~=null) then - files { - MAME_DIR .. "src/emu/cpu/sm8500/sm8500.c", - MAME_DIR .. "src/emu/cpu/sm8500/sm8500.h", - } -end - -if (CPUS["SM8500"]~=null or _OPTIONS["with-tools"]) then - table.insert(disasm_files , MAME_DIR .. "src/emu/cpu/sm8500/sm8500d.c") -end - --------------------------------------------------- -- Sony/Nintendo SPC700 --@src/emu/cpu/spc700/spc700.h,CPUS["SPC700"] = true -------------------------------------------------- diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index 4a6d1ad6bd5..26c5f9edd28 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -308,7 +308,6 @@ files { MAME_DIR .. "src/emu/video/generic.h", MAME_DIR .. "src/emu/video/resnet.c", MAME_DIR .. "src/emu/video/resnet.h", - MAME_DIR .. "src/emu/video/rgbutil.c", MAME_DIR .. "src/emu/video/rgbutil.h", MAME_DIR .. "src/emu/video/rgbgen.c", MAME_DIR .. "src/emu/video/rgbgen.h", diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index 1fd72cf5d07..cc729cd11bc 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -1779,7 +1779,7 @@ end if (MACHINES["RF5C296"]~=null) then MACHINES["PCCARD"] = true - files { + files { MAME_DIR .. "src/emu/machine/rf5c296.c", MAME_DIR .. "src/emu/machine/rf5c296.h", } @@ -2535,17 +2535,6 @@ if (MACHINES["AT_KEYBC"]~=null) then } end ---------------------------------------------------- --- ---@src/emu/machine/smc92x4.h,MACHINES["SMC92X4"] = true ---------------------------------------------------- - -if (MACHINES["SMC92X4"]~=null) then - files { - MAME_DIR .. "src/emu/machine/smc92x4.c", - MAME_DIR .. "src/emu/machine/smc92x4.h", - } -end --------------------------------------------------- -- diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua index 1a0cca92a99..b45ed49d27b 100644 --- a/scripts/src/netlist.lua +++ b/scripts/src/netlist.lua @@ -136,6 +136,8 @@ project "netlist" MAME_DIR .. "src/emu/netlist/devices/nld_9316.h", MAME_DIR .. "src/emu/netlist/devices/nld_ne555.c", MAME_DIR .. "src/emu/netlist/devices/nld_ne555.h", + MAME_DIR .. "src/emu/netlist/devices/nld_mm5837.c", + MAME_DIR .. "src/emu/netlist/devices/nld_mm5837.h", MAME_DIR .. "src/emu/netlist/devices/nld_r2r_dac.c", MAME_DIR .. "src/emu/netlist/devices/nld_r2r_dac.h", MAME_DIR .. "src/emu/netlist/devices/nld_legacy.c", diff --git a/scripts/src/video.lua b/scripts/src/video.lua index e94884a51a3..e37fda6dd5a 100644 --- a/scripts/src/video.lua +++ b/scripts/src/video.lua @@ -370,6 +370,18 @@ end -------------------------------------------------- -- +--@src/emu/video/i82730.h,VIDEOS["I82730"] = true +-------------------------------------------------- + +if (VIDEOS["I82730"]~=null) then + files { + MAME_DIR .. "src/emu/video/i82730.c", + MAME_DIR .. "src/emu/video/i82730.h", + } +end + +-------------------------------------------------- +-- --@src/emu/video/i8275.h,VIDEOS["I8275"] = true -------------------------------------------------- |