summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
author Firehawke <Firehawke@users.noreply.github.com>2017-12-13 21:31:27 -0700
committer Firehawke <Firehawke@users.noreply.github.com>2017-12-13 21:31:27 -0700
commit9ece34eb218c5c1960468294c733fd00ac7fa696 (patch)
tree7160ed8d2cbe2127aaaef0a21f8736403b0f8a7c /scripts/src
parent54155441e9ba9941e85d80c4834a66376a11e791 (diff)
Revert "Revert "Merge branch 'master' of https://github.com/mamedev/mame""
This reverts commit 54155441e9ba9941e85d80c4834a66376a11e791.
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/bus.lua4
-rw-r--r--scripts/src/cpu.lua2
-rw-r--r--scripts/src/formats.lua12
-rw-r--r--scripts/src/machine.lua12
-rw-r--r--scripts/src/video.lua12
5 files changed, 41 insertions, 1 deletions
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index 85b772ba345..28f07a10d68 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -1400,6 +1400,8 @@ 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",
}
@@ -1785,6 +1787,8 @@ 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 35e27b3e97f..97c0ee7e384 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -1016,7 +1016,7 @@ if (CPUS["I86"]~=null) then
}
end
-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
+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
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 29a22b23ad0..6558ff859d2 100644
--- a/scripts/src/formats.lua
+++ b/scripts/src/formats.lua
@@ -187,6 +187,18 @@ 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 d254c010116..38017680f93 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -2198,6 +2198,18 @@ 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 59ed7ef18f8..035717a2da1 100644
--- a/scripts/src/video.lua
+++ b/scripts/src/video.lua
@@ -1033,3 +1033,15 @@ 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