diff options
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/3rdparty.lua | 8 | ||||
-rw-r--r-- | scripts/src/bus.lua | 44 | ||||
-rw-r--r-- | scripts/src/cpu.lua | 22 | ||||
-rw-r--r-- | scripts/src/emu.lua | 1 | ||||
-rw-r--r-- | scripts/src/formats.lua | 12 | ||||
-rw-r--r-- | scripts/src/lib.lua | 1 | ||||
-rw-r--r-- | scripts/src/machine.lua | 4 | ||||
-rw-r--r-- | scripts/src/netlist.lua | 41 | ||||
-rw-r--r-- | scripts/src/osd/modules.lua | 4 | ||||
-rw-r--r-- | scripts/src/osd/sdl.lua | 3 | ||||
-rw-r--r-- | scripts/src/sound.lua | 20 | ||||
-rw-r--r-- | scripts/src/video.lua | 37 |
12 files changed, 156 insertions, 41 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 13904e80377..e5b64df3ac0 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -917,14 +917,14 @@ project "portaudio" "/wd4189", -- warning C4189: 'xxx' : local variable is initialized but not referenced "/wd4127", -- warning C4127: conditional expression is constant } - if _OPTIONS["vs"]=="intel-15" then + if _OPTIONS["vs"]=="intel-15" then buildoptions { "/Qwd869", -- remark #869: parameter "xxx" was never referenced "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated "/Qwd2544", -- message #2544: empty dependent statement in if-statement "/Qwd1879", -- warning #1879: unimplemented pragma ignored } - end + end configuration { "vs2015*" } buildoptions { "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration @@ -1608,9 +1608,9 @@ project "utf8proc" kind "StaticLib" defines { - "UTF8PROC_DLLEXPORT=" + "UTF8PROC_DLLEXPORT=" } - + configuration "Debug" defines { "verbose=-1", diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 7c6aa7a8167..9902d41b3b5 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -428,6 +428,8 @@ if (BUSES["C64"]~=null) then MAME_DIR .. "src/devices/bus/c64/silverrock.h", MAME_DIR .. "src/devices/bus/c64/simons_basic.cpp", MAME_DIR .. "src/devices/bus/c64/simons_basic.h", + MAME_DIR .. "src/devices/bus/c64/speakeasy.cpp", + MAME_DIR .. "src/devices/bus/c64/speakeasy.h", MAME_DIR .. "src/devices/bus/c64/stardos.cpp", MAME_DIR .. "src/devices/bus/c64/stardos.h", MAME_DIR .. "src/devices/bus/c64/std.cpp", @@ -1425,6 +1427,8 @@ if (BUSES["VIC20"]~=null) then MAME_DIR .. "src/devices/bus/vic20/vic1112.h", MAME_DIR .. "src/devices/bus/vic20/vic1210.cpp", MAME_DIR .. "src/devices/bus/vic20/vic1210.h", + MAME_DIR .. "src/devices/bus/vic20/speakeasy.cpp", + MAME_DIR .. "src/devices/bus/vic20/speakeasy.h", MAME_DIR .. "src/devices/bus/vic20/user.cpp", MAME_DIR .. "src/devices/bus/vic20/user.h", MAME_DIR .. "src/devices/bus/vic20/4cga.cpp", @@ -1493,16 +1497,18 @@ end if (BUSES["VME"]~=null) then files { - MAME_DIR .. "src/devices/bus/vme/vme.cpp", - MAME_DIR .. "src/devices/bus/vme/vme.h", - MAME_DIR .. "src/devices/bus/vme/vme_mzr8300.cpp", - MAME_DIR .. "src/devices/bus/vme/vme_mzr8300.h", - MAME_DIR .. "src/devices/bus/vme/vme_mvme350.cpp", - MAME_DIR .. "src/devices/bus/vme/vme_mvme350.h", - MAME_DIR .. "src/devices/bus/vme/vme_fcisio.cpp", - MAME_DIR .. "src/devices/bus/vme/vme_fcisio.h", - MAME_DIR .. "src/devices/bus/vme/vme_fcscsi.cpp", - MAME_DIR .. "src/devices/bus/vme/vme_fcscsi.h", + MAME_DIR .. "src/devices/bus/vme/vme.cpp", + MAME_DIR .. "src/devices/bus/vme/vme.h", + MAME_DIR .. "src/devices/bus/vme/vme_mzr8300.cpp", + MAME_DIR .. "src/devices/bus/vme/vme_mzr8300.h", + MAME_DIR .. "src/devices/bus/vme/vme_mvme350.cpp", + MAME_DIR .. "src/devices/bus/vme/vme_mvme350.h", + MAME_DIR .. "src/devices/bus/vme/vme_fccpu20.cpp", + MAME_DIR .. "src/devices/bus/vme/vme_fccpu20.h", + MAME_DIR .. "src/devices/bus/vme/vme_fcisio.cpp", + MAME_DIR .. "src/devices/bus/vme/vme_fcisio.h", + MAME_DIR .. "src/devices/bus/vme/vme_fcscsi.cpp", + MAME_DIR .. "src/devices/bus/vme/vme_fcscsi.h", } end @@ -2645,6 +2651,24 @@ end --------------------------------------------------- -- +--@src/devices/bus/amiga/keyboard/keyboard.h,BUSES["AMIGA_KEYBOARD"] = true +--------------------------------------------------- + +if (BUSES["AMIGA_KEYBOARD"]~=null) then + files { + MAME_DIR .. "src/devices/bus/amiga/keyboard/keyboard.cpp", + MAME_DIR .. "src/devices/bus/amiga/keyboard/keyboard.h", + MAME_DIR .. "src/devices/bus/amiga/keyboard/matrix.cpp", + MAME_DIR .. "src/devices/bus/amiga/keyboard/matrix.h", + MAME_DIR .. "src/devices/bus/amiga/keyboard/a1200.cpp", + MAME_DIR .. "src/devices/bus/amiga/keyboard/a1200.h", + MAME_DIR .. "src/devices/bus/amiga/keyboard/a500.cpp", + MAME_DIR .. "src/devices/bus/amiga/keyboard/a500.h", + } +end + +--------------------------------------------------- +-- --@src/devices/bus/amiga/zorro/zorro.h,BUSES["ZORRO"] = true --------------------------------------------------- diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index 802d582448c..477dac60840 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -425,7 +425,8 @@ end if (CPUS["COP400"]~=null or _OPTIONS["with-tools"]) then table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cop400/cop410ds.cpp") table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cop400/cop420ds.cpp") - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cop400/cop440ds.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cop400/cop444ds.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cop400/cop424ds.cpp") end -------------------------------------------------- @@ -611,7 +612,6 @@ if (CPUS["HCD62121"]~=null) then files { MAME_DIR .. "src/devices/cpu/hcd62121/hcd62121.cpp", MAME_DIR .. "src/devices/cpu/hcd62121/hcd62121.h", - MAME_DIR .. "src/devices/cpu/hcd62121/hcd62121_ops.h", } end @@ -1339,6 +1339,8 @@ if (CPUS["M6805"]~=null) then MAME_DIR .. "src/devices/cpu/m6805/6805ops.hxx", MAME_DIR .. "src/devices/cpu/m6805/m68705.cpp", MAME_DIR .. "src/devices/cpu/m6805/m68705.h", + MAME_DIR .. "src/devices/cpu/m6805/m68hc05.cpp", + MAME_DIR .. "src/devices/cpu/m6805/m68hc05.h", } end @@ -2415,3 +2417,19 @@ end if (CPUS["MB86901"]~=null or _OPTIONS["with-tools"]) then table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sparc/sparcdasm.cpp") end + +-------------------------------------------------- +-- Intergraph CLIPPER (C100/C300/C400) series +--@src/devices/cpu/clipper/clipper.h,CPUS["CLIPPER"] = true +-------------------------------------------------- + +if (CPUS["CLIPPER"]~=null) then + files { + MAME_DIR .. "src/devices/cpu/clipper/clipper.cpp", + MAME_DIR .. "src/devices/cpu/clipper/clipper.h", + } +end + +if (CPUS["CLIPPER"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/clipper/clipperd.cpp") +end diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index 44b67a338ae..62d33a18eb9 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -128,6 +128,7 @@ files { MAME_DIR .. "src/emu/ioport.cpp", MAME_DIR .. "src/emu/ioport.h", MAME_DIR .. "src/emu/inpttype.h", + MAME_DIR .. "src/emu/logmacro.h", MAME_DIR .. "src/emu/machine.cpp", MAME_DIR .. "src/emu/machine.h", MAME_DIR .. "src/emu/mconfig.cpp", diff --git a/scripts/src/formats.lua b/scripts/src/formats.lua index 4606137b17c..994633e26b2 100644 --- a/scripts/src/formats.lua +++ b/scripts/src/formats.lua @@ -211,6 +211,18 @@ end -------------------------------------------------- -- +--@src/lib/formats/apd_dsk.h,FORMATS["APD_DSK"] = true +-------------------------------------------------- + +if (FORMATS["APD_DSK"]~=null or _OPTIONS["with-tools"]) then + files { + MAME_DIR.. "src/lib/formats/apd_dsk.cpp", + MAME_DIR.. "src/lib/formats/apd_dsk.h", + } +end + +-------------------------------------------------- +-- --@src/lib/formats/apf_apt.h,FORMATS["APF_APT"] = true -------------------------------------------------- diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua index e102ba3cdcc..9c631aebbab 100644 --- a/scripts/src/lib.lua +++ b/scripts/src/lib.lua @@ -22,6 +22,7 @@ project "utils" ext_includedir("expat"), ext_includedir("zlib"), ext_includedir("flac"), + ext_includedir("utf8proc"), } files { diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index b4db9d9dcce..8e33f586b68 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -260,10 +260,10 @@ end --------------------------------------------------- -- ---@src/devices/machine/68561mpcc.h,MACHINES += 68561MPCC +--@src/devices/machine/68561mpcc.h,MACHINES["MPCC68561"] = true --------------------------------------------------- -if (MACHINES["68561MPCC"]~=null) then +if (MACHINES["MPCC68561"]~=null) then files { MAME_DIR .. "src/devices/machine/68561mpcc.cpp", MAME_DIR .. "src/devices/machine/68561mpcc.h", diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua index 089148c2d18..4fc5a6ed27b 100644 --- a/scripts/src/netlist.lua +++ b/scripts/src/netlist.lua @@ -28,26 +28,28 @@ project "netlist" } files { - MAME_DIR .. "src/lib/netlist/nl_base.cpp", - MAME_DIR .. "src/lib/netlist/nl_base.h", + MAME_DIR .. "src/lib/netlist/nl_base.cpp", + MAME_DIR .. "src/lib/netlist/nl_base.h", MAME_DIR .. "src/lib/netlist/nl_config.h", - MAME_DIR .. "src/lib/netlist/nl_errstr.h", + MAME_DIR .. "src/lib/netlist/nl_errstr.h", MAME_DIR .. "src/lib/netlist/nl_dice_compat.h", - MAME_DIR .. "src/lib/netlist/nl_factory.cpp", - MAME_DIR .. "src/lib/netlist/nl_factory.h", + MAME_DIR .. "src/lib/netlist/nl_factory.cpp", + MAME_DIR .. "src/lib/netlist/nl_factory.h", MAME_DIR .. "src/lib/netlist/nl_lists.h", MAME_DIR .. "src/lib/netlist/nl_parser.cpp", MAME_DIR .. "src/lib/netlist/nl_parser.h", MAME_DIR .. "src/lib/netlist/nl_setup.cpp", MAME_DIR .. "src/lib/netlist/nl_setup.h", - MAME_DIR .. "src/lib/netlist/nl_time.h", + MAME_DIR .. "src/lib/netlist/nl_time.h", MAME_DIR .. "src/lib/netlist/plib/pconfig.h", MAME_DIR .. "src/lib/netlist/plib/palloc.cpp", MAME_DIR .. "src/lib/netlist/plib/palloc.h", MAME_DIR .. "src/lib/netlist/plib/pchrono.cpp", MAME_DIR .. "src/lib/netlist/plib/pchrono.h", - MAME_DIR .. "src/lib/netlist/plib/pexception.cpp", - MAME_DIR .. "src/lib/netlist/plib/pexception.h", + MAME_DIR .. "src/lib/netlist/plib/pexception.cpp", + MAME_DIR .. "src/lib/netlist/plib/pexception.h", + MAME_DIR .. "src/lib/netlist/plib/pfunction.cpp", + MAME_DIR .. "src/lib/netlist/plib/pfunction.h", MAME_DIR .. "src/lib/netlist/plib/pfmtlog.cpp", MAME_DIR .. "src/lib/netlist/plib/pfmtlog.h", MAME_DIR .. "src/lib/netlist/plib/plists.h", @@ -57,6 +59,7 @@ project "netlist" MAME_DIR .. "src/lib/netlist/plib/poptions.h", MAME_DIR .. "src/lib/netlist/plib/pparser.cpp", MAME_DIR .. "src/lib/netlist/plib/pparser.h", + MAME_DIR .. "src/lib/netlist/plib/ppmf.h", MAME_DIR .. "src/lib/netlist/plib/pstate.cpp", MAME_DIR .. "src/lib/netlist/plib/pstate.h", MAME_DIR .. "src/lib/netlist/plib/pstring.cpp", @@ -72,17 +75,19 @@ project "netlist" MAME_DIR .. "src/lib/netlist/tools/nl_convert.h", MAME_DIR .. "src/lib/netlist/analog/nld_bjt.cpp", MAME_DIR .. "src/lib/netlist/analog/nld_bjt.h", - MAME_DIR .. "src/lib/netlist/analog/nld_fourterm.cpp", - MAME_DIR .. "src/lib/netlist/analog/nld_fourterm.h", + MAME_DIR .. "src/lib/netlist/analog/nlid_fourterm.cpp", + MAME_DIR .. "src/lib/netlist/analog/nlid_fourterm.h", + MAME_DIR .. "src/lib/netlist/analog/nld_fourterm.h", MAME_DIR .. "src/lib/netlist/analog/nld_switches.cpp", MAME_DIR .. "src/lib/netlist/analog/nld_switches.h", - MAME_DIR .. "src/lib/netlist/analog/nld_twoterm.cpp", + MAME_DIR .. "src/lib/netlist/analog/nlid_twoterm.cpp", + MAME_DIR .. "src/lib/netlist/analog/nlid_twoterm.h", MAME_DIR .. "src/lib/netlist/analog/nld_twoterm.h", MAME_DIR .. "src/lib/netlist/analog/nld_opamps.cpp", MAME_DIR .. "src/lib/netlist/analog/nld_opamps.h", MAME_DIR .. "src/lib/netlist/solver/nld_solver.cpp", MAME_DIR .. "src/lib/netlist/solver/nld_solver.h", - MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.cpp", + MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.cpp", MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct1.h", @@ -187,14 +192,14 @@ project "netlist" MAME_DIR .. "src/lib/netlist/devices/nld_log.h", MAME_DIR .. "src/lib/netlist/devices/nld_system.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_system.h", - MAME_DIR .. "src/lib/netlist/devices/nld_truthtable.cpp", - MAME_DIR .. "src/lib/netlist/devices/nld_truthtable.h", + MAME_DIR .. "src/lib/netlist/devices/nlid_truthtable.cpp", + MAME_DIR .. "src/lib/netlist/devices/nlid_truthtable.h", MAME_DIR .. "src/lib/netlist/devices/nlid_cmos.h", MAME_DIR .. "src/lib/netlist/devices/nlid_system.h", - MAME_DIR .. "src/lib/netlist/devices/nlid_proxy.cpp", - MAME_DIR .. "src/lib/netlist/devices/nlid_proxy.h", - MAME_DIR .. "src/lib/netlist/macro/nlm_base.cpp", - MAME_DIR .. "src/lib/netlist/macro/nlm_base.h", + MAME_DIR .. "src/lib/netlist/devices/nlid_proxy.cpp", + MAME_DIR .. "src/lib/netlist/devices/nlid_proxy.h", + MAME_DIR .. "src/lib/netlist/macro/nlm_base.cpp", + MAME_DIR .. "src/lib/netlist/macro/nlm_base.h", MAME_DIR .. "src/lib/netlist/macro/nlm_ttl74xx.cpp", MAME_DIR .. "src/lib/netlist/macro/nlm_ttl74xx.h", MAME_DIR .. "src/lib/netlist/macro/nlm_cd4xxx.cpp", diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index ce9977d8dd6..9ca2bcaa196 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -221,6 +221,10 @@ function osdmodulesbuild() defines { "NO_USE_PORTAUDIO", } + else + includedirs { + ext_includedir("portaudio"), + } end if _OPTIONS["NO_USE_MIDI"]=="1" then diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index af6ff1b98ce..5970f6d3334 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -113,7 +113,8 @@ function maintargetosdoptions(_target,_subtarget) configuration { "mingw*" or "vs*" } targetprefix "sdl" links { - "psapi" + "psapi", + "Ole32", } configuration { } diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua index ab05c06847c..171ad3f30cc 100644 --- a/scripts/src/sound.lua +++ b/scripts/src/sound.lua @@ -154,13 +154,13 @@ end --------------------------------------------------- -- Amiga audio hardware ---@src/devices/sound/amiga.h,SOUNDS["AMIGA"] = true +--@src/devices/machine/8364_paula.h,SOUNDS["PAULA_8364"] = true --------------------------------------------------- -if (SOUNDS["AMIGA"]~=null) then +if (SOUNDS["PAULA_8364"]~=null) then files { - MAME_DIR .. "src/devices/sound/amiga.cpp", - MAME_DIR .. "src/devices/sound/amiga.h", + MAME_DIR .. "src/devices/machine/8364_paula.cpp", + MAME_DIR .. "src/devices/machine/8364_paula.h", } end @@ -1424,3 +1424,15 @@ if (SOUNDS["MM5837"]~=null) then MAME_DIR .. "src/devices/sound/mm5837.h", } end + +--------------------------------------------------- +-- Intelligent Designs DAVE +--@src/devices/sound/dave.h,MACHINES["DAVE"] = true +--------------------------------------------------- + +if (SOUNDS["DAVE"]~=null) then + files { + MAME_DIR .. "src/devices/sound/dave.cpp", + MAME_DIR .. "src/devices/sound/dave.h", + } +end diff --git a/scripts/src/video.lua b/scripts/src/video.lua index 0bda85053a7..770de5db893 100644 --- a/scripts/src/video.lua +++ b/scripts/src/video.lua @@ -330,6 +330,18 @@ end -------------------------------------------------- -- +--@src/devices/video/hlcd0515.h,VIDEOS["HLCD0515"] = true +-------------------------------------------------- + +if (VIDEOS["HLCD0515"]~=null) then + files { + MAME_DIR .. "src/devices/video/hlcd0515.cpp", + MAME_DIR .. "src/devices/video/hlcd0515.h", + } +end + +-------------------------------------------------- +-- --@src/devices/video/huc6202.h,VIDEOS["HUC6202"] = true -------------------------------------------------- @@ -378,6 +390,18 @@ end -------------------------------------------------- -- +--@src/devices/video/huc6271.h,VIDEOS["HUC6271"] = true +-------------------------------------------------- + +if (VIDEOS["HUC6271"]~=null) then + files { + MAME_DIR .. "src/devices/video/huc6271.cpp", + MAME_DIR .. "src/devices/video/huc6271.h", + } +end + +-------------------------------------------------- +-- --@src/devices/video/huc6272.h,VIDEOS["HUC6272"] = true -------------------------------------------------- @@ -912,3 +936,16 @@ if (VIDEOS["EF9369"]~=null) then MAME_DIR .. "src/devices/video/ef9369.h", } end + +-------------------------------------------------- +-- +--@src/devices/video/ppu2c0x.h,VIDEOS["PPU2C0X"] = true +-------------------------------------------------- + +if (VIDEOS["PPU2C0X"]~=null) then + files { + MAME_DIR .. "src/devices/video/ppu2c0x.cpp", + MAME_DIR .. "src/devices/video/ppu2c0x.h", + } +end + |