diff options
author | 2017-12-13 21:01:10 -0700 | |
---|---|---|
committer | 2017-12-13 21:01:10 -0700 | |
commit | 54155441e9ba9941e85d80c4834a66376a11e791 (patch) | |
tree | aa44bdaf0035cbe188d64c447f225f10f7d76d8d /scripts/target/mame/mess.lua | |
parent | f537428e5a40ba6dde8ca9bf0fe9ae6b1f189ac4 (diff) |
Revert "Merge branch 'master' of https://github.com/mamedev/mame"
This reverts commit f537428e5a40ba6dde8ca9bf0fe9ae6b1f189ac4, reversing
changes made to 0d70d798107d4e4e8fb9f230410aeb1e888d65c5.
Diffstat (limited to 'scripts/target/mame/mess.lua')
-rw-r--r-- | scripts/target/mame/mess.lua | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index 03a80c4a6f0..56b283c88e6 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -353,7 +353,6 @@ VIDEOS["GB_LCD"] = true VIDEOS["GBA_LCD"] = true VIDEOS["MGA2064W"] = true VIDEOS["PPU2C0X"] = true -VIDEOS["DP8510"] = true -------------------------------------------------- -- specify available machine cores @@ -524,7 +523,6 @@ MACHINES["PROM82S129"] = true MACHINES["R64H156"] = true MACHINES["RF5C296"] = true MACHINES["RIOT6532"] = true -MACHINES["RIPPLE_COUNTER"] = true MACHINES["ROC10937"] = true MACHINES["RP5C01"] = true MACHINES["RP5C15"] = true @@ -776,7 +774,6 @@ FORMATS["ACORN_DSK"] = true FORMATS["ADAM_CAS"] = true FORMATS["ADAM_DSK"] = true FORMATS["AFS_DSK"] = true -FORMATS["AGAT840K_HLE_DSK"] = true FORMATS["AMI_DSK"] = true FORMATS["AP2_DSK"] = true FORMATS["APD_DSK"] = true @@ -1076,7 +1073,7 @@ function linkProjects_mame_mess(_target, _subtarget) "samsung", "sanyo", "saturn", - "segacons", + "sega", "sequential", "sgi", "sharp", @@ -1249,6 +1246,8 @@ files { MAME_DIR .. "src/mame/machine/dc.cpp", MAME_DIR .. "src/mame/machine/dc-ctrl.cpp", MAME_DIR .. "src/mame/machine/dc-ctrl.h", + MAME_DIR .. "src/mame/machine/gdrom.cpp", + MAME_DIR .. "src/mame/machine/gdrom.h", MAME_DIR .. "src/mame/machine/jvs13551.cpp", MAME_DIR .. "src/mame/machine/jvs13551.h", MAME_DIR .. "src/mame/machine/maple-dc.cpp", @@ -2135,8 +2134,6 @@ files { MAME_DIR .. "src/mame/drivers/hp48.cpp", MAME_DIR .. "src/mame/includes/hp48.h", MAME_DIR .. "src/mame/machine/hp48.cpp", - MAME_DIR .. "src/mame/machine/hp9845_printer.cpp", - MAME_DIR .. "src/mame/machine/hp9845_printer.h", MAME_DIR .. "src/mame/video/hp48.cpp", MAME_DIR .. "src/mame/drivers/hp49gp.cpp", MAME_DIR .. "src/mame/drivers/hp9845.cpp", @@ -2671,9 +2668,6 @@ files { MAME_DIR .. "src/mame/drivers/prodigy.cpp", MAME_DIR .. "src/mame/machine/nl_prodigy.cpp", MAME_DIR .. "src/mame/machine/nl_prodigy.h", - } -includedirs { - MAME_DIR .. "3rdparty/rapidjson/include", } createMESSProjects(_target, _subtarget, "psion") @@ -2799,18 +2793,11 @@ files { MAME_DIR .. "src/mame/includes/phc25.h", } --- Don't call this project "sega" or it collides with the arcade one --- and merges with it, which ends up with libsega.a linked after --- libshared.a. The link then fails on linux because SEGAM1AUDIO and RAX --- are in shared while model* and stv are in sega. - -createMESSProjects(_target, _subtarget, "segacons") +createMESSProjects(_target, _subtarget, "sega") files { MAME_DIR .. "src/mame/drivers/dccons.cpp", MAME_DIR .. "src/mame/includes/dccons.h", MAME_DIR .. "src/mame/machine/dccons.cpp", - MAME_DIR .. "src/mame/machine/gdrom.cpp", - MAME_DIR .. "src/mame/machine/gdrom.h", MAME_DIR .. "src/mame/drivers/megadriv.cpp", MAME_DIR .. "src/mame/includes/megadriv.h", MAME_DIR .. "src/mame/drivers/segapico.cpp", |