diff options
author | 2019-10-29 10:49:22 +1100 | |
---|---|---|
committer | 2019-10-29 10:49:22 +1100 | |
commit | e4ee887d5cdffb6767e1078fe9dca32d7c920f2e (patch) | |
tree | 1c3ecc61329eae8cbad23cf1d2ca03a01764f739 /docs/release/scripts/src | |
parent | 1e8a03afab272a010763935b564c742155513797 (diff) |
0.215 Release filestag215
Diffstat (limited to 'docs/release/scripts/src')
-rw-r--r-- | docs/release/scripts/src/3rdparty.lua | 57 | ||||
-rw-r--r-- | docs/release/scripts/src/bus.lua | 48 | ||||
-rw-r--r-- | docs/release/scripts/src/cpu.lua | 19 | ||||
-rw-r--r-- | docs/release/scripts/src/machine.lua | 60 | ||||
-rw-r--r-- | docs/release/scripts/src/main.lua | 8 | ||||
-rw-r--r-- | docs/release/scripts/src/netlist.lua | 39 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/modules.lua | 1 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/sdl.lua | 6 | ||||
-rw-r--r-- | docs/release/scripts/src/tools.lua | 20 | ||||
-rw-r--r-- | docs/release/scripts/src/video.lua | 3 |
10 files changed, 205 insertions, 56 deletions
diff --git a/docs/release/scripts/src/3rdparty.lua b/docs/release/scripts/src/3rdparty.lua index 2a31b4ee392..db0e89ca862 100644 --- a/docs/release/scripts/src/3rdparty.lua +++ b/docs/release/scripts/src/3rdparty.lua @@ -157,6 +157,12 @@ project "softfloat" includedirs { MAME_DIR .. "src/osd", } + + configuration { "gmake or ninja" } + buildoptions_cpp { + "-x c++", + } + configuration { "vs*" } buildoptions { "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data @@ -196,6 +202,11 @@ includedirs { MAME_DIR .. "3rdparty/softfloat3/source/8086", } +configuration { "gmake or ninja" } +buildoptions_cpp { + "-x c++", +} + configuration { "vs*" } buildoptions { "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used @@ -1198,6 +1209,14 @@ project "bimg" configuration { } + if _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="linux" or _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="asmjs" then + if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs")) then + buildoptions_cpp { + "-Wno-unused-const-variable", + } + end + end + defines { "__STDC_LIMIT_MACROS", "__STDC_FORMAT_MACROS", @@ -1206,11 +1225,25 @@ project "bimg" includedirs { MAME_DIR .. "3rdparty/bimg/include", + MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec", + MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/include", } files { MAME_DIR .. "3rdparty/bimg/src/image.cpp", MAME_DIR .. "3rdparty/bimg/src/image_gnf.cpp", + + MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/astc_file.cc", + MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/codec.cc", + MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/endpoint_codec.cc", + MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/footprint.cc", + MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/integer_sequence_codec.cc", + MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/intermediate_astc_block.cc", + MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/logical_astc_block.cc", + MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/partition.cc", + MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/physical_astc_block.cc", + MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/quantization.cc", + MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/weight_infill.cc", } -------------------------------------------------- @@ -1227,6 +1260,7 @@ project "bgfx" "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data "/wd4611", -- warning C4611: interaction between '_setjmp' and C++ object destruction is non-portable "/wd4310", -- warning C4310: cast truncates constant value + "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used } configuration { "vsllvm" } @@ -1335,18 +1369,37 @@ end end end + if _OPTIONS["targetos"]=="macosx" and _OPTIONS["gcc"]~=nil then + if string.find(_OPTIONS["gcc"], "clang") and (version < 80000) then + defines { + "TARGET_OS_OSX=1", + } + end + end + defines { "__STDC_LIMIT_MACROS", "__STDC_FORMAT_MACROS", "__STDC_CONSTANT_MACROS", "BGFX_CONFIG_MAX_FRAME_BUFFERS=128", } + + if _OPTIONS["targetos"]=="linux" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="openbsd" then + if _OPTIONS["NO_X11"]=="1" then + defines { + "BGFX_CONFIG_RENDERER_OPENGLES=1", + "BGFX_CONFIG_RENDERER_OPENGL=0", + } + end + end + files { MAME_DIR .. "3rdparty/bgfx/src/bgfx.cpp", MAME_DIR .. "3rdparty/bgfx/src/debug_renderdoc.cpp", MAME_DIR .. "3rdparty/bgfx/src/dxgi.cpp", MAME_DIR .. "3rdparty/bgfx/src/glcontext_egl.cpp", MAME_DIR .. "3rdparty/bgfx/src/glcontext_glx.cpp", + MAME_DIR .. "3rdparty/bgfx/src/glcontext_html5.cpp", MAME_DIR .. "3rdparty/bgfx/src/glcontext_wgl.cpp", MAME_DIR .. "3rdparty/bgfx/src/nvapi.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d11.cpp", @@ -1355,6 +1408,7 @@ end MAME_DIR .. "3rdparty/bgfx/src/renderer_gl.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_gnm.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_noop.cpp", + MAME_DIR .. "3rdparty/bgfx/src/renderer_nvn.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_vk.cpp", MAME_DIR .. "3rdparty/bgfx/src/shader.cpp", MAME_DIR .. "3rdparty/bgfx/src/shader_dx9bc.cpp", @@ -1375,6 +1429,9 @@ end MAME_DIR .. "3rdparty/bgfx/src/glcontext_nsgl.mm", MAME_DIR .. "3rdparty/bgfx/src/renderer_mtl.mm", } + buildoptions { + "-x objective-c++", + } end -------------------------------------------------- diff --git a/docs/release/scripts/src/bus.lua b/docs/release/scripts/src/bus.lua index d068bf9a1de..37514196b6b 100644 --- a/docs/release/scripts/src/bus.lua +++ b/docs/release/scripts/src/bus.lua @@ -282,6 +282,38 @@ end --------------------------------------------------- -- +--@src/devices/bus/ata/atadev.h,BUSES["ATA"] = true +--@src/devices/bus/ata/ataintf.h,BUSES["ATA"] = true +--------------------------------------------------- + +if (MACHINES["ATAFLASH"]~=null) then + BUSES["ATA"] = true +end + +if (BUSES["ATA"]~=null) then + files { + MAME_DIR .. "src/devices/bus/ata/atadev.cpp", + MAME_DIR .. "src/devices/bus/ata/atadev.h", + MAME_DIR .. "src/devices/bus/ata/atahle.cpp", + MAME_DIR .. "src/devices/bus/ata/atahle.h", + MAME_DIR .. "src/devices/bus/ata/ataintf.cpp", + MAME_DIR .. "src/devices/bus/ata/ataintf.h", + MAME_DIR .. "src/devices/bus/ata/atapicdr.cpp", + MAME_DIR .. "src/devices/bus/ata/atapicdr.h", + MAME_DIR .. "src/devices/bus/ata/atapihle.cpp", + MAME_DIR .. "src/devices/bus/ata/atapihle.h", + MAME_DIR .. "src/devices/bus/ata/cr589.cpp", + MAME_DIR .. "src/devices/bus/ata/cr589.h", + MAME_DIR .. "src/devices/bus/ata/idehd.cpp", + MAME_DIR .. "src/devices/bus/ata/idehd.h", + MAME_DIR .. "src/devices/bus/ata/px320a.cpp", + MAME_DIR .. "src/devices/bus/ata/px320a.h", + } +end + + +--------------------------------------------------- +-- --@src/devices/bus/bbc/fdc/fdc.h,BUSES["BBC_FDC"] = true --------------------------------------------------- @@ -800,6 +832,8 @@ if (BUSES["DMV"]~=null) then files { MAME_DIR .. "src/devices/bus/dmv/dmvbus.cpp", MAME_DIR .. "src/devices/bus/dmv/dmvbus.h", + MAME_DIR .. "src/devices/bus/dmv/k012.cpp", + MAME_DIR .. "src/devices/bus/dmv/k012.h", MAME_DIR .. "src/devices/bus/dmv/k210.cpp", MAME_DIR .. "src/devices/bus/dmv/k210.h", MAME_DIR .. "src/devices/bus/dmv/k220.cpp", @@ -1257,6 +1291,8 @@ if (BUSES["ISA"]~=null) then MAME_DIR .. "src/devices/bus/isa/cl_sh260.h", MAME_DIR .. "src/devices/bus/isa/mpu401.cpp", MAME_DIR .. "src/devices/bus/isa/mpu401.h", + MAME_DIR .. "src/devices/bus/isa/pcmidi.cpp", + MAME_DIR .. "src/devices/bus/isa/pcmidi.h", MAME_DIR .. "src/devices/bus/isa/sblaster.cpp", MAME_DIR .. "src/devices/bus/isa/sblaster.h", MAME_DIR .. "src/devices/bus/isa/stereo_fx.cpp", @@ -3802,6 +3838,18 @@ end --------------------------------------------------- -- +--@src/devices/bus/hp_optroms/hp_optrom.h,BUSES["HP_OPTROM"] = true +--------------------------------------------------- + +if (BUSES["HP9825_OPTROM"]~=null) then + files { + MAME_DIR .. "src/devices/bus/hp9825_optroms/hp9825_optrom.cpp", + MAME_DIR .. "src/devices/bus/hp9825_optroms/hp9825_optrom.h", + } +end + +--------------------------------------------------- +-- --@src/devices/bus/hp9845_io/hp9845_io.h,BUSES["HP9845_IO"] = true --------------------------------------------------- diff --git a/docs/release/scripts/src/cpu.lua b/docs/release/scripts/src/cpu.lua index 788e2cd3eb6..ceb6fb6f27f 100644 --- a/docs/release/scripts/src/cpu.lua +++ b/docs/release/scripts/src/cpu.lua @@ -568,6 +568,23 @@ if (CPUS["F8"]~=null or _OPTIONS["with-tools"]) then end -------------------------------------------------- +-- Fujitsu FR +--@src/devices/cpu/fr/fr.h,CPUS["FR"] = true +-------------------------------------------------- + +if (CPUS["FR"]~=null) then + files { + MAME_DIR .. "src/devices/cpu/fr/fr.cpp", + MAME_DIR .. "src/devices/cpu/fr/fr.h", + } +end + +if (CPUS["FR"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/fr/frdasm.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/fr/frdasm.h") +end + +-------------------------------------------------- -- G65816 --@src/devices/cpu/g65816/g65816.h,CPUS["G65816"] = true -------------------------------------------------- @@ -2526,6 +2543,8 @@ end if (CPUS["Z180"]~=null) then files { + MAME_DIR .. "src/devices/cpu/z180/hd647180x.cpp", + MAME_DIR .. "src/devices/cpu/z180/hd647180x.h", MAME_DIR .. "src/devices/cpu/z180/z180.cpp", MAME_DIR .. "src/devices/cpu/z180/z180.h", MAME_DIR .. "src/devices/cpu/z180/z180cb.hxx", diff --git a/docs/release/scripts/src/machine.lua b/docs/release/scripts/src/machine.lua index b42ca10229b..126ee953ad9 100644 --- a/docs/release/scripts/src/machine.lua +++ b/docs/release/scripts/src/machine.lua @@ -65,6 +65,8 @@ files { -- MAME_DIR .. "src/devices/imagedev/snapquik.h", -- MAME_DIR .. "src/devices/imagedev/wafadrive.cpp", -- MAME_DIR .. "src/devices/imagedev/wafadrive.h", +-- MAME_DIR .. "src/devices/imagedev/avivideo.cpp", +-- MAME_DIR .. "src/devices/imagedev/avivideo.h", } @@ -573,6 +575,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/adc0804.h,MACHINES["ADC0804"] = true +--------------------------------------------------- + +if (MACHINES["ADC0804"]~=null) then + files { + MAME_DIR .. "src/devices/machine/adc0804.cpp", + MAME_DIR .. "src/devices/machine/adc0804.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/adc0808.h,MACHINES["ADC0808"] = true --------------------------------------------------- @@ -781,7 +795,6 @@ end --------------------------------------------------- if (MACHINES["ATAFLASH"]~=null) then - MACHINES["IDE"] = true MACHINES["PCCARD"] = true files { MAME_DIR .. "src/devices/machine/ataflash.cpp", @@ -901,18 +914,6 @@ end --------------------------------------------------- -- ---@src/devices/machine/cr589.h,MACHINES["CR589"] = true ---------------------------------------------------- - -if (MACHINES["CR589"]~=null) then - files { - MAME_DIR .. "src/devices/machine/cr589.cpp", - MAME_DIR .. "src/devices/machine/cr589.h", - } -end - ---------------------------------------------------- --- --@src/devices/machine/cs4031.h,MACHINES["CS4031"] = true --------------------------------------------------- @@ -1422,27 +1423,14 @@ end --------------------------------------------------- -- ---@src/devices/machine/atadev.h,MACHINES["IDE"] = true ---@src/devices/machine/ataintf.h,MACHINES["IDE"] = true +--@src/devices/machine/idectrl.h,MACHINES["IDECTRL"] = true +--@src/devices/machine/vt83c461.h,MACHINES["IDECTRL"] = true --------------------------------------------------- -if (MACHINES["IDE"]~=null) then - MACHINES["T10"] = true +if (MACHINES["IDECTRL"]~=null) then files { - MAME_DIR .. "src/devices/machine/atadev.cpp", - MAME_DIR .. "src/devices/machine/atadev.h", - MAME_DIR .. "src/devices/machine/atahle.cpp", - MAME_DIR .. "src/devices/machine/atahle.h", - MAME_DIR .. "src/devices/machine/ataintf.cpp", - MAME_DIR .. "src/devices/machine/ataintf.h", - MAME_DIR .. "src/devices/machine/atapicdr.cpp", - MAME_DIR .. "src/devices/machine/atapicdr.h", - MAME_DIR .. "src/devices/machine/atapihle.cpp", - MAME_DIR .. "src/devices/machine/atapihle.h", MAME_DIR .. "src/devices/machine/idectrl.cpp", MAME_DIR .. "src/devices/machine/idectrl.h", - MAME_DIR .. "src/devices/machine/idehd.cpp", - MAME_DIR .. "src/devices/machine/idehd.h", MAME_DIR .. "src/devices/machine/vt83c461.cpp", MAME_DIR .. "src/devices/machine/vt83c461.h", } @@ -2828,7 +2816,7 @@ end -- --------------------------------------------------- -if (BUSES["SCSI"]~=null) then +if (BUSES["ATA"]~=null) or (BUSES["SCSI"]~=null) then MACHINES["T10"] = true end @@ -4092,6 +4080,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/aic580.h,MACHINES["AIC580"] = true +--------------------------------------------------- + +if (MACHINES["AIC580"]~=null) then + files { + MAME_DIR .. "src/devices/machine/aic580.cpp", + MAME_DIR .. "src/devices/machine/aic580.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/aic6250.h,MACHINES["AIC6250"] = true --------------------------------------------------- diff --git a/docs/release/scripts/src/main.lua b/docs/release/scripts/src/main.lua index d02ea56a068..5d336b39e5e 100644 --- a/docs/release/scripts/src/main.lua +++ b/docs/release/scripts/src/main.lua @@ -380,12 +380,12 @@ if (STANDALONE~=true) then GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true }, } custombuildtask { - { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".flt" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py", MAME_DIR .. "src/".._target .."/" .. _target ..".lst" }, {"@echo Building driver list...", PYTHON .. " $(1) $(2) $(<) > $(@)" }}, + { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".flt" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makedep.py", MAME_DIR .. "src/".._target .."/" .. _target ..".lst" }, {"@echo Building driver list...", PYTHON .. " $(1) driverlist $(2) -f $(<) > $(@)" }}, } else if os.isfile(MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst") then custombuildtask { - { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py" }, {"@echo Building driver list...", PYTHON .. " $(1) $(<) > $(@)" }}, + { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makedep.py" }, {"@echo Building driver list...", PYTHON .. " $(1) driverlist $(<) > $(@)" }}, } else dependency { @@ -393,7 +393,7 @@ if (STANDALONE~=true) then GEN_DIR .. _target .. "/" .. _target .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true }, } custombuildtask { - { MAME_DIR .. "src/".._target .."/" .. _target ..".lst" , GEN_DIR .. _target .. "/" .. _target .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py" }, {"@echo Building driver list...", PYTHON .. " $(1) $(<) > $(@)" }}, + { MAME_DIR .. "src/".._target .."/" .. _target ..".lst" , GEN_DIR .. _target .. "/" .. _target .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makedep.py" }, {"@echo Building driver list...", PYTHON .. " $(1) driverlist $(<) > $(@)" }}, } end end @@ -405,7 +405,7 @@ if (STANDALONE~=true) then GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true }, } custombuildtask { - { GEN_DIR .. _target .."/" .. _subtarget ..".flt" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py", MAME_DIR .. "src/".._target .."/" .. _target ..".lst" }, {"@echo Building driver list...", PYTHON .. " $(1) $(2) $(<) > $(@)" }}, + { GEN_DIR .. _target .."/" .. _subtarget ..".flt" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makedep.py", MAME_DIR .. "src/".._target .."/" .. _target ..".lst" }, {"@echo Building driver list...", PYTHON .. " $(1) driverlist $(2) -f $(<) > $(@)" }}, } end diff --git a/docs/release/scripts/src/netlist.lua b/docs/release/scripts/src/netlist.lua index 973e9fb2ffc..fd3a2fe8f82 100644 --- a/docs/release/scripts/src/netlist.lua +++ b/docs/release/scripts/src/netlist.lua @@ -13,16 +13,16 @@ project "netlist" uuid "665ef8ac-2a4c-4c3e-a05f-fd1e5db11de9" kind (LIBTYPE) - if _OPTIONS["targetos"]=="windows" then - configuration { "mingw* or vs*" } - defines { - "UNICODE", - "_UNICODE", - "_WIN32_WINNT=0x0501", - "WIN32_LEAN_AND_MEAN", - "NOMINMAX", - } - end + if _OPTIONS["targetos"]=="windows" then + configuration { "mingw* or vs*" } + defines { + "UNICODE", + "_UNICODE", + "_WIN32_WINNT=0x0501", + "WIN32_LEAN_AND_MEAN", + "NOMINMAX", + } + end addprojectflags() @@ -32,7 +32,7 @@ project "netlist" includedirs { MAME_DIR .. "src/lib", - MAME_DIR .. "src/lib/netlist", + MAME_DIR .. "src/lib/netlist", } files { @@ -43,15 +43,13 @@ project "netlist" 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_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_types.h", + MAME_DIR .. "src/lib/netlist/nl_types.h", MAME_DIR .. "src/lib/netlist/plib/pconfig.h", 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", @@ -71,13 +69,12 @@ project "netlist" 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", MAME_DIR .. "src/lib/netlist/plib/pstring.h", - MAME_DIR .. "src/lib/netlist/plib/pstream.cpp", + MAME_DIR .. "src/lib/netlist/plib/pstrutil.h", MAME_DIR .. "src/lib/netlist/plib/pstream.h", - MAME_DIR .. "src/lib/netlist/plib/ptime.h", + MAME_DIR .. "src/lib/netlist/plib/ptime.h", MAME_DIR .. "src/lib/netlist/plib/ptypes.h", MAME_DIR .. "src/lib/netlist/plib/putil.cpp", MAME_DIR .. "src/lib/netlist/plib/putil.h", @@ -85,9 +82,9 @@ 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_generic_models.h", - MAME_DIR .. "src/lib/netlist/analog/nld_mosfet.cpp", - MAME_DIR .. "src/lib/netlist/analog/nld_mosfet.h", + MAME_DIR .. "src/lib/netlist/analog/nld_generic_models.h", + MAME_DIR .. "src/lib/netlist/analog/nld_mosfet.cpp", + MAME_DIR .. "src/lib/netlist/analog/nld_mosfet.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", @@ -227,4 +224,4 @@ project "netlist" MAME_DIR .. "src/lib/netlist/macro/nlm_opamp.h", MAME_DIR .. "src/lib/netlist/macro/nlm_other.cpp", MAME_DIR .. "src/lib/netlist/macro/nlm_other.h", -} + } diff --git a/docs/release/scripts/src/osd/modules.lua b/docs/release/scripts/src/osd/modules.lua index 4675139f87a..0df5597b254 100644 --- a/docs/release/scripts/src/osd/modules.lua +++ b/docs/release/scripts/src/osd/modules.lua @@ -217,6 +217,7 @@ function osdmodulesbuild() MAME_DIR .. "3rdparty/bgfx/examples/common", MAME_DIR .. "3rdparty/bgfx/include", MAME_DIR .. "3rdparty/bgfx/3rdparty", + MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", MAME_DIR .. "3rdparty/bx/include", ext_includedir("rapidjson") } diff --git a/docs/release/scripts/src/osd/sdl.lua b/docs/release/scripts/src/osd/sdl.lua index ed660e65f9b..43b1e20e079 100644 --- a/docs/release/scripts/src/osd/sdl.lua +++ b/docs/release/scripts/src/osd/sdl.lua @@ -29,6 +29,12 @@ function maintargetosdoptions(_target,_subtarget) "X11", "Xinerama", } + else + if _OPTIONS["targetos"]=="linux" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="openbsd" then + links { + "EGL", + } + end end if _OPTIONS["NO_USE_XINPUT"]~="1" then diff --git a/docs/release/scripts/src/tools.lua b/docs/release/scripts/src/tools.lua index aa966e7763b..09f8739e30a 100644 --- a/docs/release/scripts/src/tools.lua +++ b/docs/release/scripts/src/tools.lua @@ -133,6 +133,15 @@ files { configuration { "mingw*" or "vs*" } targetextension ".exe" +-- workaround for https://developercommunity.visualstudio.com/content/problem/752372/vs2019-v1631-c-internal-compiler-error-when-zi-opt.html +-- should be fixed in 16.5 +configuration { "Debug", "vs2019" } + if _OPTIONS["vs"]==nil then + flags { + "NoEditAndContinue", + } + end + configuration { } strip() @@ -749,6 +758,15 @@ files { configuration { "mingw*" or "vs*" } targetextension ".exe" +-- workaround for https://developercommunity.visualstudio.com/content/problem/752372/vs2019-v1631-c-internal-compiler-error-when-zi-opt.html +-- should be fixed in 16.5 +configuration { "Debug", "vs2019" } + if _OPTIONS["vs"]==nil then + flags { + "NoEditAndContinue", + } + end + configuration { } strip() @@ -813,6 +831,7 @@ if (_OPTIONS["osd"] == "sdl") then end links { + "utils", "ocore_" .. _OPTIONS["osd"], ext_lib("utf8proc"), } @@ -876,6 +895,7 @@ if (_OPTIONS["osd"] == "sdl") then includedirs { MAME_DIR .. "src/osd", + MAME_DIR .. "src/lib/util", } files { diff --git a/docs/release/scripts/src/video.lua b/docs/release/scripts/src/video.lua index d4c4920002a..e1c5160b439 100644 --- a/docs/release/scripts/src/video.lua +++ b/docs/release/scripts/src/video.lua @@ -1038,7 +1038,8 @@ if (VIDEOS["VOODOO"]~=null) then files { MAME_DIR .. "src/devices/video/voodoo.cpp", MAME_DIR .. "src/devices/video/voodoo.h", - MAME_DIR .. "src/devices/video/vooddefs.h", + MAME_DIR .. "src/devices/video/vooddefs.ipp", + MAME_DIR .. "src/devices/video/voodoo_rast.ipp", } end |