diff options
| author | 2017-05-14 13:35:43 -0700 | |
|---|---|---|
| committer | 2017-05-14 13:35:43 -0700 | |
| commit | 239f178cfea029f55e60c3fbd0411cf591260fc2 (patch) | |
| tree | de0472f5137f10c7138c307b2331d27aa4ae34f0 /scripts/src | |
| parent | 06d430fbcb4dc5e52dd65f8b340895649ec0f5b2 (diff) | |
| parent | e141a1c3b7f16adc411c5b1b80e6792caf67f493 (diff) | |
Merge branch 'master' into games_master_cartridge
Diffstat (limited to 'scripts/src')
| -rw-r--r-- | scripts/src/bus.lua | 97 | ||||
| -rw-r--r-- | scripts/src/cpu.lua | 8 | ||||
| -rw-r--r-- | scripts/src/lib.lua | 3 | ||||
| -rw-r--r-- | scripts/src/machine.lua | 37 | ||||
| -rw-r--r-- | scripts/src/osd/sdl.lua | 1 |
5 files changed, 66 insertions, 80 deletions
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 3f8e9616e3f..97b664f7d74 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -2343,7 +2343,6 @@ end --@src/devices/bus/ti99x/990_tap.h,BUSES["TI99X"] = true --@src/devices/bus/ti99x/990_hd.h,BUSES["TI99X"] = true --@src/devices/bus/ti99x/genboard.h,BUSES["TI99X"] = true ---@src/devices/bus/ti99x/joyport.h,BUSES["TI99X"] = true --------------------------------------------------- if (BUSES["TI99X"]~=null) then @@ -2356,22 +2355,12 @@ if (BUSES["TI99X"]~=null) then MAME_DIR .. "src/devices/bus/ti99x/990_tap.h", MAME_DIR .. "src/devices/bus/ti99x/998board.cpp", MAME_DIR .. "src/devices/bus/ti99x/998board.h", - MAME_DIR .. "src/devices/bus/ti99x/busmouse.cpp", - MAME_DIR .. "src/devices/bus/ti99x/busmouse.h", - MAME_DIR .. "src/devices/bus/ti99x/colorbus.cpp", - MAME_DIR .. "src/devices/bus/ti99x/colorbus.h", MAME_DIR .. "src/devices/bus/ti99x/datamux.cpp", MAME_DIR .. "src/devices/bus/ti99x/datamux.h", MAME_DIR .. "src/devices/bus/ti99x/genboard.cpp", MAME_DIR .. "src/devices/bus/ti99x/genboard.h", MAME_DIR .. "src/devices/bus/ti99x/gromport.cpp", MAME_DIR .. "src/devices/bus/ti99x/gromport.h", - MAME_DIR .. "src/devices/bus/ti99x/handset.cpp", - MAME_DIR .. "src/devices/bus/ti99x/handset.h", - MAME_DIR .. "src/devices/bus/ti99x/joyport.cpp", - MAME_DIR .. "src/devices/bus/ti99x/joyport.h", - MAME_DIR .. "src/devices/bus/ti99x/mecmouse.cpp", - MAME_DIR .. "src/devices/bus/ti99x/mecmouse.h", MAME_DIR .. "src/devices/bus/ti99x/ti99defs.cpp", MAME_DIR .. "src/devices/bus/ti99x/ti99defs.h", } @@ -2379,43 +2368,55 @@ end --------------------------------------------------- -- ---@src/devices/bus/ti99_peb/peribox.h,BUSES["TI99PEB"] = true ---------------------------------------------------- - -if (BUSES["TI99PEB"]~=null) then - files { - MAME_DIR .. "src/devices/bus/ti99_peb/peribox.cpp", - MAME_DIR .. "src/devices/bus/ti99_peb/peribox.h", - MAME_DIR .. "src/devices/bus/ti99_peb/bwg.cpp", - MAME_DIR .. "src/devices/bus/ti99_peb/bwg.h", - MAME_DIR .. "src/devices/bus/ti99_peb/evpc.cpp", - MAME_DIR .. "src/devices/bus/ti99_peb/evpc.h", - MAME_DIR .. "src/devices/bus/ti99_peb/hfdc.cpp", - MAME_DIR .. "src/devices/bus/ti99_peb/hfdc.h", - MAME_DIR .. "src/devices/bus/ti99_peb/horizon.cpp", - MAME_DIR .. "src/devices/bus/ti99_peb/horizon.h", - MAME_DIR .. "src/devices/bus/ti99_peb/hsgpl.cpp", - MAME_DIR .. "src/devices/bus/ti99_peb/hsgpl.h", - MAME_DIR .. "src/devices/bus/ti99_peb/memex.cpp", - MAME_DIR .. "src/devices/bus/ti99_peb/memex.h", - MAME_DIR .. "src/devices/bus/ti99_peb/myarcmem.cpp", - MAME_DIR .. "src/devices/bus/ti99_peb/myarcmem.h", - MAME_DIR .. "src/devices/bus/ti99_peb/pcode.cpp", - MAME_DIR .. "src/devices/bus/ti99_peb/pcode.h", - MAME_DIR .. "src/devices/bus/ti99_peb/samsmem.cpp", - MAME_DIR .. "src/devices/bus/ti99_peb/samsmem.h", - MAME_DIR .. "src/devices/bus/ti99_peb/spchsyn.cpp", - MAME_DIR .. "src/devices/bus/ti99_peb/spchsyn.h", - MAME_DIR .. "src/devices/bus/ti99_peb/ti_32kmem.cpp", - MAME_DIR .. "src/devices/bus/ti99_peb/ti_32kmem.h", - MAME_DIR .. "src/devices/bus/ti99_peb/ti_fdc.cpp", - MAME_DIR .. "src/devices/bus/ti99_peb/ti_fdc.h", - MAME_DIR .. "src/devices/bus/ti99_peb/ti_rs232.cpp", - MAME_DIR .. "src/devices/bus/ti99_peb/ti_rs232.h", - MAME_DIR .. "src/devices/bus/ti99_peb/tn_ide.cpp", - MAME_DIR .. "src/devices/bus/ti99_peb/tn_ide.h", - MAME_DIR .. "src/devices/bus/ti99_peb/tn_usbsm.cpp", - MAME_DIR .. "src/devices/bus/ti99_peb/tn_usbsm.h", +--@src/devices/bus/ti99/colorbus/colorbus.h,BUSES["TI99"] = true +--@src/devices/bus/ti99/joyport/joyport.h,BUSES["TI99"] = true +--@src/devices/bus/ti99/peb/peribox.h,BUSES["TI99"] = true +--------------------------------------------------- + +if (BUSES["TI99"]~=null) then + files { + MAME_DIR .. "src/devices/bus/ti99/colorbus/busmouse.cpp", + MAME_DIR .. "src/devices/bus/ti99/colorbus/busmouse.h", + MAME_DIR .. "src/devices/bus/ti99/colorbus/colorbus.cpp", + MAME_DIR .. "src/devices/bus/ti99/colorbus/colorbus.h", + MAME_DIR .. "src/devices/bus/ti99/joyport/handset.cpp", + MAME_DIR .. "src/devices/bus/ti99/joyport/handset.h", + MAME_DIR .. "src/devices/bus/ti99/joyport/joyport.cpp", + MAME_DIR .. "src/devices/bus/ti99/joyport/joyport.h", + MAME_DIR .. "src/devices/bus/ti99/joyport/mecmouse.cpp", + MAME_DIR .. "src/devices/bus/ti99/joyport/mecmouse.h", + MAME_DIR .. "src/devices/bus/ti99/peb/peribox.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/peribox.h", + MAME_DIR .. "src/devices/bus/ti99/peb/bwg.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/bwg.h", + MAME_DIR .. "src/devices/bus/ti99/peb/evpc.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/evpc.h", + MAME_DIR .. "src/devices/bus/ti99/peb/hfdc.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/hfdc.h", + MAME_DIR .. "src/devices/bus/ti99/peb/horizon.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/horizon.h", + MAME_DIR .. "src/devices/bus/ti99/peb/hsgpl.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/hsgpl.h", + MAME_DIR .. "src/devices/bus/ti99/peb/memex.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/memex.h", + MAME_DIR .. "src/devices/bus/ti99/peb/myarcmem.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/myarcmem.h", + MAME_DIR .. "src/devices/bus/ti99/peb/pcode.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/pcode.h", + MAME_DIR .. "src/devices/bus/ti99/peb/samsmem.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/samsmem.h", + MAME_DIR .. "src/devices/bus/ti99/peb/spchsyn.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/spchsyn.h", + MAME_DIR .. "src/devices/bus/ti99/peb/ti_32kmem.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/ti_32kmem.h", + MAME_DIR .. "src/devices/bus/ti99/peb/ti_fdc.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/ti_fdc.h", + MAME_DIR .. "src/devices/bus/ti99/peb/ti_rs232.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/ti_rs232.h", + MAME_DIR .. "src/devices/bus/ti99/peb/tn_ide.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/tn_ide.h", + MAME_DIR .. "src/devices/bus/ti99/peb/tn_usbsm.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/tn_usbsm.h", } end diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index bd15e70df1a..62abccc0754 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -644,6 +644,8 @@ if (CPUS["SH2"]~=null) then files { MAME_DIR .. "src/devices/cpu/sh2/sh2.cpp", MAME_DIR .. "src/devices/cpu/sh2/sh2.h", + MAME_DIR .. "src/devices/cpu/sh2/sh2comn.cpp", + MAME_DIR .. "src/devices/cpu/sh2/sh2comn.h", MAME_DIR .. "src/devices/cpu/sh2/sh2fe.cpp", MAME_DIR .. "src/devices/cpu/sh2/sh7604_bus.cpp", MAME_DIR .. "src/devices/cpu/sh2/sh7604_bus.h", @@ -651,8 +653,6 @@ if (CPUS["SH2"]~=null) then MAME_DIR .. "src/devices/cpu/sh2/sh7604_sci.h", MAME_DIR .. "src/devices/cpu/sh2/sh7604_wdt.cpp", MAME_DIR .. "src/devices/cpu/sh2/sh7604_wdt.h", - --MAME_DIR .. "src/devices/cpu/sh2/sh2comn.cpp", - --MAME_DIR .. "src/devices/cpu/sh2/sh2comn.h", --MAME_DIR .. "src/devices/cpu/sh2/sh2drc.cpp", } end @@ -695,6 +695,7 @@ if (CPUS["HPHYBRID"]~=null) then files { MAME_DIR .. "src/devices/cpu/hphybrid/hphybrid.cpp", MAME_DIR .. "src/devices/cpu/hphybrid/hphybrid.h", + MAME_DIR .. "src/devices/cpu/hphybrid/hphybrid_defs.h", } end @@ -743,6 +744,7 @@ if (CPUS["E1"]~=null) then files { MAME_DIR .. "src/devices/cpu/e132xs/e132xs.cpp", MAME_DIR .. "src/devices/cpu/e132xs/e132xs.h", + MAME_DIR .. "src/devices/cpu/e132xs/e132xsdefs.h", MAME_DIR .. "src/devices/cpu/e132xs/e132xsop.hxx", } end @@ -1149,6 +1151,7 @@ if (CPUS["PSX"]~=null) then files { MAME_DIR .. "src/devices/cpu/psx/psx.cpp", MAME_DIR .. "src/devices/cpu/psx/psx.h", + MAME_DIR .. "src/devices/cpu/psx/psxdefs.h", MAME_DIR .. "src/devices/cpu/psx/gte.cpp", MAME_DIR .. "src/devices/cpu/psx/gte.h", MAME_DIR .. "src/devices/cpu/psx/dma.cpp", @@ -1676,6 +1679,7 @@ if (CPUS["RSP"]~=null) then files { MAME_DIR .. "src/devices/cpu/rsp/rsp.cpp", MAME_DIR .. "src/devices/cpu/rsp/rsp.h", + MAME_DIR .. "src/devices/cpu/rsp/rspdefs.h", MAME_DIR .. "src/devices/cpu/rsp/rspdrc.cpp", MAME_DIR .. "src/devices/cpu/rsp/rspfe.cpp", MAME_DIR .. "src/devices/cpu/rsp/rspfe.h", diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua index 9c631aebbab..07e73c73495 100644 --- a/scripts/src/lib.lua +++ b/scripts/src/lib.lua @@ -79,7 +79,7 @@ project "utils" MAME_DIR .. "src/lib/util/palette.cpp", MAME_DIR .. "src/lib/util/palette.h", MAME_DIR .. "src/lib/util/path_to_regex.cpp", - MAME_DIR .. "src/lib/util/path_to_regex.h", + MAME_DIR .. "src/lib/util/path_to_regex.hpp", MAME_DIR .. "src/lib/util/plaparse.cpp", MAME_DIR .. "src/lib/util/plaparse.h", MAME_DIR .. "src/lib/util/png.cpp", @@ -102,7 +102,6 @@ project "utils" MAME_DIR .. "src/lib/util/unzip.cpp", MAME_DIR .. "src/lib/util/unzip.h", MAME_DIR .. "src/lib/util/un7z.cpp", - MAME_DIR .. "src/lib/util/un7z.h", MAME_DIR .. "src/lib/util/vbiparse.cpp", MAME_DIR .. "src/lib/util/vbiparse.h", MAME_DIR .. "src/lib/util/vecstream.cpp", diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index 8de625dfe9c..d38706a4e16 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -1983,7 +1983,6 @@ if (MACHINES["PCI"]~=null) then MAME_DIR .. "src/devices/machine/i82439tx.h", MAME_DIR .. "src/devices/machine/i82371sb.cpp", MAME_DIR .. "src/devices/machine/i82371sb.h", - MAME_DIR .. "src/devices/machine/lpc.cpp", MAME_DIR .. "src/devices/machine/lpc.h", MAME_DIR .. "src/devices/machine/lpc-acpi.cpp", MAME_DIR .. "src/devices/machine/lpc-acpi.h", @@ -1993,6 +1992,8 @@ if (MACHINES["PCI"]~=null) then MAME_DIR .. "src/devices/machine/lpc-pit.h", MAME_DIR .. "src/devices/machine/vrc4373.cpp", MAME_DIR .. "src/devices/machine/vrc4373.h", + MAME_DIR .. "src/devices/machine/vrc5074.cpp", + MAME_DIR .. "src/devices/machine/vrc5074.h", MAME_DIR .. "src/devices/machine/gt64xxx.cpp", MAME_DIR .. "src/devices/machine/gt64xxx.h", } @@ -2229,26 +2230,21 @@ end --------------------------------------------------- -- ---@src/devices/machine/s3c2400.h,MACHINES["S3C2400"] = true +--@src/devices/machine/s3c2400.h,MACHINES["S3C24XX"] = true +--@src/devices/machine/s3c2410.h,MACHINES["S3C24XX"] = true +--@src/devices/machine/s3c2440.h,MACHINES["S3C24XX"] = true --------------------------------------------------- -if (MACHINES["S3C2400"]~=null) then +if (MACHINES["S3C24XX"]~=null) then files { MAME_DIR .. "src/devices/machine/s3c2400.cpp", MAME_DIR .. "src/devices/machine/s3c2400.h", - MAME_DIR .. "src/devices/machine/s3c24xx.hxx", - } -end - ---------------------------------------------------- --- ---@src/devices/machine/s3c2410.h,MACHINES["S3C2410"] = true ---------------------------------------------------- - -if (MACHINES["S3C2410"]~=null) then - files { MAME_DIR .. "src/devices/machine/s3c2410.cpp", MAME_DIR .. "src/devices/machine/s3c2410.h", + MAME_DIR .. "src/devices/machine/s3c2440.cpp", + MAME_DIR .. "src/devices/machine/s3c2440.h", + MAME_DIR .. "src/devices/machine/s3c24xx.cpp", + MAME_DIR .. "src/devices/machine/s3c24xx.h", MAME_DIR .. "src/devices/machine/s3c24xx.hxx", } end @@ -2267,19 +2263,6 @@ end --------------------------------------------------- -- ---@src/devices/machine/s3c2440.h,MACHINES["S3C2440"] = true ---------------------------------------------------- - -if (MACHINES["S3C2440"]~=null) then - files { - MAME_DIR .. "src/devices/machine/s3c2440.cpp", - MAME_DIR .. "src/devices/machine/s3c2440.h", - MAME_DIR .. "src/devices/machine/s3c24xx.hxx", - } -end - ---------------------------------------------------- --- --@src/devices/machine/scnxx562.h,MACHINES["DUSCC"] = true --------------------------------------------------- diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 5970f6d3334..f310a11360c 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -418,7 +418,6 @@ project ("osd_" .. _OPTIONS["osd"]) files { MAME_DIR .. "src/osd/sdl/osdsdl.h", - MAME_DIR .. "src/osd/sdl/sdlinc.h", MAME_DIR .. "src/osd/sdl/sdlprefix.h", MAME_DIR .. "src/osd/sdl/sdlmain.cpp", MAME_DIR .. "src/osd/osdepend.h", |
