From 54155441e9ba9941e85d80c4834a66376a11e791 Mon Sep 17 00:00:00 2001 From: Firehawke Date: Wed, 13 Dec 2017 21:01:10 -0700 Subject: Revert "Merge branch 'master' of https://github.com/mamedev/mame" This reverts commit f537428e5a40ba6dde8ca9bf0fe9ae6b1f189ac4, reversing changes made to 0d70d798107d4e4e8fb9f230410aeb1e888d65c5. --- scripts/src/bus.lua | 4 ---- scripts/src/cpu.lua | 2 +- scripts/src/formats.lua | 12 ------------ scripts/src/machine.lua | 12 ------------ scripts/src/video.lua | 12 ------------ 5 files changed, 1 insertion(+), 41 deletions(-) (limited to 'scripts/src') diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 28f07a10d68..85b772ba345 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -1400,8 +1400,6 @@ if (BUSES["SS50"]~=null) then files { MAME_DIR .. "src/devices/bus/ss50/interface.cpp", MAME_DIR .. "src/devices/bus/ss50/interface.h", - MAME_DIR .. "src/devices/bus/ss50/mpc.cpp", - MAME_DIR .. "src/devices/bus/ss50/mpc.h", MAME_DIR .. "src/devices/bus/ss50/mps.cpp", MAME_DIR .. "src/devices/bus/ss50/mps.h", } @@ -1787,8 +1785,6 @@ if (BUSES["A2BUS"]~=null) then MAME_DIR .. "src/devices/bus/a2bus/agat7langcard.h", MAME_DIR .. "src/devices/bus/a2bus/agat7ram.cpp", MAME_DIR .. "src/devices/bus/a2bus/agat7ram.h", - MAME_DIR .. "src/devices/bus/a2bus/agat840k_hle.cpp", - MAME_DIR .. "src/devices/bus/a2bus/agat840k_hle.h", MAME_DIR .. "src/devices/bus/a2bus/ssprite.cpp", MAME_DIR .. "src/devices/bus/a2bus/ssprite.h", MAME_DIR .. "src/devices/bus/a2bus/ssbapple.cpp", diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index 97c0ee7e384..35e27b3e97f 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -1016,7 +1016,7 @@ if (CPUS["I86"]~=null) then } end -if (CPUS["E1"]~=null or CPUS["SH"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RSP"]~=null or CPUS["ARM7"]~=null or CPUS["ADSP21062"]~=null or CPUS["MB86235"]~=null or CPUS["I86"]~=null or CPUS["I386"]~=null or _OPTIONS["with-tools"]) then +if (CPUS["SH"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RSP"]~=null or CPUS["ARM7"]~=null or CPUS["ADSP21062"]~=null or CPUS["MB86235"]~=null or CPUS["I86"]~=null or CPUS["I386"]~=null or _OPTIONS["with-tools"]) then table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i386/i386dasm.cpp") table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i386/i386dasm.h") end diff --git a/scripts/src/formats.lua b/scripts/src/formats.lua index 6558ff859d2..29a22b23ad0 100644 --- a/scripts/src/formats.lua +++ b/scripts/src/formats.lua @@ -185,18 +185,6 @@ if (FORMATS["AFS_DSK"]~=null or _OPTIONS["with-tools"]) then } end --------------------------------------------------- --- ---@src/lib/formats/agat840k_hle_dsk.h,FORMATS["AGAT840K_HLE_DSK"] = true --------------------------------------------------- - -if (FORMATS["AGAT840K_HLE_DSK"]~=null or _OPTIONS["with-tools"]) then - files { - MAME_DIR.. "src/lib/formats/agat840k_hle_dsk.cpp", - MAME_DIR.. "src/lib/formats/agat840k_hle_dsk.h", - } -end - -------------------------------------------------- -- --@src/lib/formats/ami_dsk.h,FORMATS["AMI_DSK"] = true diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index 38017680f93..d254c010116 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -2196,18 +2196,6 @@ if (MACHINES["RF5C296"]~=null) then } end ---------------------------------------------------- --- ---@src/devices/machine/ripple_counter.h,MACHINES["RIPPLE_COUNTER"] = true ---------------------------------------------------- - -if (MACHINES["RIPPLE_COUNTER"]~=null) then - files { - MAME_DIR .. "src/devices/machine/ripple_counter.cpp", - MAME_DIR .. "src/devices/machine/ripple_counter.h", - } -end - --------------------------------------------------- -- --@src/devices/machine/roc10937.h,MACHINES["ROC10937"] = true diff --git a/scripts/src/video.lua b/scripts/src/video.lua index 035717a2da1..59ed7ef18f8 100644 --- a/scripts/src/video.lua +++ b/scripts/src/video.lua @@ -1033,15 +1033,3 @@ if (VIDEOS["I4100"]~=null) then MAME_DIR .. "src/devices/video/imagetek_i4100.h", } end - --------------------------------------------------- --- ---@src/devices/video/dp8510.h,VIDEOS["DP8510"] = true --------------------------------------------------- - -if (VIDEOS["DP8510"]~=null) then - files { - MAME_DIR .. "src/devices/video/dp8510.cpp", - MAME_DIR .. "src/devices/video/dp8510.h", - } -end -- cgit v1.2.3-70-g09d2