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/machine.lua | |
| parent | 06d430fbcb4dc5e52dd65f8b340895649ec0f5b2 (diff) | |
| parent | e141a1c3b7f16adc411c5b1b80e6792caf67f493 (diff) | |
Merge branch 'master' into games_master_cartridge
Diffstat (limited to 'scripts/src/machine.lua')
| -rw-r--r-- | scripts/src/machine.lua | 37 |
1 files changed, 10 insertions, 27 deletions
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 --------------------------------------------------- |
