diff options
author | 2017-12-13 21:01:10 -0700 | |
---|---|---|
committer | 2017-12-13 21:01:10 -0700 | |
commit | 54155441e9ba9941e85d80c4834a66376a11e791 (patch) | |
tree | aa44bdaf0035cbe188d64c447f225f10f7d76d8d /scripts | |
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')
-rw-r--r-- | scripts/src/bus.lua | 4 | ||||
-rw-r--r-- | scripts/src/cpu.lua | 2 | ||||
-rw-r--r-- | scripts/src/formats.lua | 12 | ||||
-rw-r--r-- | scripts/src/machine.lua | 12 | ||||
-rw-r--r-- | scripts/src/video.lua | 12 | ||||
-rw-r--r-- | scripts/target/mame/arcade.lua | 12 | ||||
-rw-r--r-- | scripts/target/mame/mess.lua | 21 |
7 files changed, 9 insertions, 66 deletions
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 @@ -187,18 +187,6 @@ 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 @@ -2198,18 +2198,6 @@ 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 diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index de933af5893..f0cf97fdb6d 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -535,7 +535,6 @@ MACHINES["RA17XX"] = true --MACHINES["R64H156"] = true MACHINES["RF5C296"] = true --MACHINES["RIOT6532"] = true -MACHINES["RIPPLE_COUNTER"] = true MACHINES["ROC10937"] = true MACHINES["RP5C01"] = true MACHINES["RP5C15"] = true @@ -888,8 +887,6 @@ files { MAME_DIR .. "src/mame/audio/decobsmt.h", MAME_DIR .. "src/mame/audio/efo_zsu.cpp", MAME_DIR .. "src/mame/audio/efo_zsu.h", - MAME_DIR .. "src/mame/audio/rax.cpp", - MAME_DIR .. "src/mame/audio/rax.h", MAME_DIR .. "src/mame/audio/segam1audio.cpp", MAME_DIR .. "src/mame/audio/segam1audio.h", } @@ -1950,8 +1947,6 @@ files { MAME_DIR .. "src/mame/drivers/pgm2.cpp", MAME_DIR .. "src/mame/video/pgm2.cpp", MAME_DIR .. "src/mame/includes/pgm2.h", - MAME_DIR .. "src/mame/machine/pgm2_memcard.cpp", - MAME_DIR .. "src/mame/machine/pgm2_memcard.h", MAME_DIR .. "src/mame/drivers/pgm3.cpp", MAME_DIR .. "src/mame/drivers/spoker.cpp", MAME_DIR .. "src/mame/machine/igs036crypt.cpp", @@ -3173,7 +3168,6 @@ files { MAME_DIR .. "src/mame/includes/megadrvb.h", MAME_DIR .. "src/mame/drivers/megaplay.cpp", MAME_DIR .. "src/mame/drivers/megatech.cpp", - MAME_DIR .. "src/mame/drivers/calcune.cpp", MAME_DIR .. "src/mame/drivers/model1.cpp", MAME_DIR .. "src/mame/includes/model1.h", MAME_DIR .. "src/mame/machine/model1.cpp", @@ -3363,6 +3357,8 @@ files { MAME_DIR .. "src/mame/video/sega16sp.h", MAME_DIR .. "src/mame/video/segaic24.cpp", MAME_DIR .. "src/mame/video/segaic24.h", + MAME_DIR .. "src/mame/machine/gdrom.cpp", + MAME_DIR .. "src/mame/machine/gdrom.h", MAME_DIR .. "src/mame/machine/xbox.cpp", MAME_DIR .. "src/mame/machine/xbox_usb.cpp", MAME_DIR .. "src/mame/machine/xbox_pci.cpp", @@ -4655,7 +4651,6 @@ files { MAME_DIR .. "src/mame/includes/norautp.h", MAME_DIR .. "src/mame/audio/norautp.cpp", MAME_DIR .. "src/mame/drivers/notechan.cpp", - MAME_DIR .. "src/mame/drivers/nsg6809.cpp", MAME_DIR .. "src/mame/drivers/nsmpoker.cpp", MAME_DIR .. "src/mame/drivers/oneshot.cpp", MAME_DIR .. "src/mame/includes/oneshot.h", @@ -4688,6 +4683,8 @@ files { MAME_DIR .. "src/mame/drivers/pse.cpp", MAME_DIR .. "src/mame/drivers/quizo.cpp", MAME_DIR .. "src/mame/drivers/quizpun2.cpp", + MAME_DIR .. "src/mame/audio/rax.cpp", + MAME_DIR .. "src/mame/audio/rax.h", MAME_DIR .. "src/mame/drivers/rbmk.cpp", MAME_DIR .. "src/mame/drivers/rcorsair.cpp", MAME_DIR .. "src/mame/drivers/re900.cpp", @@ -4771,6 +4768,5 @@ files { MAME_DIR .. "src/mame/drivers/xyonix.cpp", MAME_DIR .. "src/mame/includes/xyonix.h", MAME_DIR .. "src/mame/video/xyonix.cpp", - MAME_DIR .. "src/mame/drivers/yuvomz80.cpp", } end 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", |