summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
author angelosa <salese_corp_ltd@email.it>2016-09-28 11:55:04 +0200
committer angelosa <salese_corp_ltd@email.it>2016-09-28 11:55:04 +0200
commit7465cdc2f9e4ad61e701ba89f2a894dbdff283dd (patch)
tree11832b77592b8fd14955116a5ebb589c2f293b33 /scripts
parentf4749d03f7f65cabde47aa8b62cd5776cf3b0140 (diff)
parent87c993dc7407c167aa9536683b6d9e5531fe7d57 (diff)
Merge branch 'master' into sh7604_rewrite
Diffstat (limited to 'scripts')
-rw-r--r--scripts/target/mame/arcade.lua1
-rw-r--r--scripts/target/mame/mess.lua1
2 files changed, 1 insertions, 1 deletions
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 8605fd50502..c353bce46c3 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -4486,6 +4486,7 @@ files {
MAME_DIR .. "src/mame/includes/malzak.h",
MAME_DIR .. "src/mame/video/malzak.cpp",
MAME_DIR .. "src/mame/drivers/manohman.cpp",
+ MAME_DIR .. "src/mame/drivers/marywu.cpp",
MAME_DIR .. "src/mame/drivers/mcatadv.cpp",
MAME_DIR .. "src/mame/includes/mcatadv.h",
MAME_DIR .. "src/mame/video/mcatadv.cpp",
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index afc5ba6a2ef..7658f14e15d 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -3311,7 +3311,6 @@ files {
MAME_DIR .. "src/mame/drivers/lg-dvd.cpp",
MAME_DIR .. "src/mame/drivers/lola8a.cpp",
MAME_DIR .. "src/mame/drivers/m79152pc.cpp",
- MAME_DIR .. "src/mame/drivers/marywu.cpp",
MAME_DIR .. "src/mame/drivers/mccpm.cpp",
MAME_DIR .. "src/mame/drivers/mes.cpp",
MAME_DIR .. "src/mame/drivers/mice.cpp",