diff options
author | 2019-02-27 16:23:31 +0900 | |
---|---|---|
committer | 2019-02-27 16:23:31 +0900 | |
commit | 0fb660d642d81116e9702cbfc5223c71472d8fc1 (patch) | |
tree | e2f7d4fc7d4a6192aca407e9d3a4ab0b38b19e21 /scripts/src | |
parent | efec7bd39b92117ea276a01a1db2eb882778a531 (diff) | |
parent | 5309bae38b65195426ff0b988e0204c1efef114e (diff) |
Merge branch 'master' into cps3_code
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/3rdparty.lua | 28 | ||||
-rw-r--r-- | scripts/src/bus.lua | 35 | ||||
-rw-r--r-- | scripts/src/cpu.lua | 20 | ||||
-rw-r--r-- | scripts/src/machine.lua | 51 | ||||
-rw-r--r-- | scripts/src/main.lua | 8 | ||||
-rw-r--r-- | scripts/src/netlist.lua | 8 | ||||
-rw-r--r-- | scripts/src/osd/sdl.lua | 20 | ||||
-rw-r--r-- | scripts/src/osd/windows.lua | 1 | ||||
-rw-r--r-- | scripts/src/sound.lua | 3 | ||||
-rw-r--r-- | scripts/src/tools.lua | 98 | ||||
-rw-r--r-- | scripts/src/video.lua | 12 |
11 files changed, 251 insertions, 33 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 2ccfa749e19..2a31b4ee392 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -633,6 +633,12 @@ end "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration } + configuration { "vsllvm" } + buildoptions { + "-Wno-unused-function", + "-Wno-enum-conversion", + } + configuration { } defines { "WORDS_BIGENDIAN=0", @@ -970,6 +976,12 @@ end "SQLITE_OS_WINRT", } + configuration { "vsllvm" } + buildoptions { + "-Wno-deprecated-declarations", + "-Wno-unused-variable", + } + configuration { } files { @@ -1216,6 +1228,13 @@ project "bgfx" "/wd4611", -- warning C4611: interaction between '_setjmp' and C++ object destruction is non-portable "/wd4310", -- warning C4310: cast truncates constant value } + + configuration { "vsllvm" } + buildoptions { + "-Wno-unneeded-internal-declaration", + "-Wno-unused-const-variable", + } + if _OPTIONS["vs"]=="intel-15" then buildoptions { "/Qwd906", -- message #906: effect of this "#pragma pack" directive is local to function "xxx" @@ -1389,6 +1408,15 @@ project "portaudio" "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration } + configuration { "vsllvm" } + buildoptions { + "-Wno-deprecated-declarations", + "-Wno-missing-braces", + "-Wno-unused-variable", + "-Wno-switch", + "-Wno-unused-function", + } + configuration { "gmake or ninja" } buildoptions_c { "-Wno-strict-prototypes", diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 29c9f459fa1..57fdc9b3210 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -209,6 +209,8 @@ if (BUSES["APRICOT_EXPANSION"]~=null) then MAME_DIR .. "src/devices/bus/apricot/expansion/cards.h", MAME_DIR .. "src/devices/bus/apricot/expansion/ram.cpp", MAME_DIR .. "src/devices/bus/apricot/expansion/ram.h", + MAME_DIR .. "src/devices/bus/apricot/expansion/winchester.cpp", + MAME_DIR .. "src/devices/bus/apricot/expansion/winchester.h", } end @@ -357,6 +359,8 @@ if (BUSES["BBC_1MHZBUS"]~=null) then MAME_DIR .. "src/devices/bus/bbc/1mhzbus/m2000.h", MAME_DIR .. "src/devices/bus/bbc/1mhzbus/opus3.cpp", MAME_DIR .. "src/devices/bus/bbc/1mhzbus/opus3.h", + MAME_DIR .. "src/devices/bus/bbc/1mhzbus/sprite.cpp", + MAME_DIR .. "src/devices/bus/bbc/1mhzbus/sprite.h", MAME_DIR .. "src/devices/bus/bbc/1mhzbus/cfa3000opt.cpp", MAME_DIR .. "src/devices/bus/bbc/1mhzbus/cfa3000opt.h", } @@ -834,6 +838,8 @@ if (BUSES["ELECTRON"]~=null) then MAME_DIR .. "src/devices/bus/electron/fbjoy.h", MAME_DIR .. "src/devices/bus/electron/plus1.cpp", MAME_DIR .. "src/devices/bus/electron/plus1.h", + MAME_DIR .. "src/devices/bus/electron/plus2.cpp", + MAME_DIR .. "src/devices/bus/electron/plus2.h", MAME_DIR .. "src/devices/bus/electron/plus3.cpp", MAME_DIR .. "src/devices/bus/electron/plus3.h", MAME_DIR .. "src/devices/bus/electron/pwrjoy.cpp", @@ -861,6 +867,8 @@ if (BUSES["ELECTRON_CART"]~=null) then MAME_DIR .. "src/devices/bus/electron/cart/abr.h", MAME_DIR .. "src/devices/bus/electron/cart/ap34.cpp", MAME_DIR .. "src/devices/bus/electron/cart/ap34.h", + MAME_DIR .. "src/devices/bus/electron/cart/ap5.cpp", + MAME_DIR .. "src/devices/bus/electron/cart/ap5.h", MAME_DIR .. "src/devices/bus/electron/cart/aqr.cpp", MAME_DIR .. "src/devices/bus/electron/cart/aqr.h", MAME_DIR .. "src/devices/bus/electron/cart/click.cpp", @@ -881,6 +889,8 @@ if (BUSES["ELECTRON_CART"]~=null) then MAME_DIR .. "src/devices/bus/electron/cart/std.h", MAME_DIR .. "src/devices/bus/electron/cart/stlefs.cpp", MAME_DIR .. "src/devices/bus/electron/cart/stlefs.h", + MAME_DIR .. "src/devices/bus/electron/cart/tube.cpp", + MAME_DIR .. "src/devices/bus/electron/cart/tube.h", } end @@ -1184,6 +1194,8 @@ if (BUSES["ISA"]~=null) then MAME_DIR .. "src/devices/bus/isa/hdc.h", MAME_DIR .. "src/devices/bus/isa/ibm_mfc.cpp", MAME_DIR .. "src/devices/bus/isa/ibm_mfc.h", + MAME_DIR .. "src/devices/bus/isa/cl_sh260.cpp", + 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/sblaster.cpp", @@ -1274,6 +1286,8 @@ if (BUSES["ISA"]~=null) then MAME_DIR .. "src/devices/bus/isa/eis_sad8852.h", MAME_DIR .. "src/devices/bus/isa/lbaenhancer.cpp", MAME_DIR .. "src/devices/bus/isa/lbaenhancer.h", + MAME_DIR .. "src/devices/bus/isa/np600.cpp", + MAME_DIR .. "src/devices/bus/isa/np600.h", } end @@ -1293,6 +1307,19 @@ if (BUSES["ISBX"]~=null) then } end +--------------------------------------------------- +-- +--@src/devices/bus/jakks_gamekey/slot.h,BUSES["JAKKS_GAMEKEY"] = true +--------------------------------------------------- + +if (BUSES["JAKKS_GAMEKEY"]~=null) then + files { + MAME_DIR .. "src/devices/bus/jakks_gamekey/slot.cpp", + MAME_DIR .. "src/devices/bus/jakks_gamekey/slot.h", + MAME_DIR .. "src/devices/bus/jakks_gamekey/rom.cpp", + MAME_DIR .. "src/devices/bus/jakks_gamekey/rom.h", + } +end --------------------------------------------------- -- @@ -2596,10 +2623,14 @@ if (BUSES["SG1000_EXP"]~=null) then files { MAME_DIR .. "src/devices/bus/sg1000_exp/sg1000exp.cpp", MAME_DIR .. "src/devices/bus/sg1000_exp/sg1000exp.h", - MAME_DIR .. "src/devices/bus/sg1000_exp/sk1100.cpp", - MAME_DIR .. "src/devices/bus/sg1000_exp/sk1100.h", MAME_DIR .. "src/devices/bus/sg1000_exp/fm_unit.cpp", MAME_DIR .. "src/devices/bus/sg1000_exp/fm_unit.h", + MAME_DIR .. "src/devices/bus/sg1000_exp/sk1100.cpp", + MAME_DIR .. "src/devices/bus/sg1000_exp/sk1100.h", + MAME_DIR .. "src/devices/bus/sg1000_exp/sk1100prn.cpp", + MAME_DIR .. "src/devices/bus/sg1000_exp/sk1100prn.h", + MAME_DIR .. "src/devices/bus/sg1000_exp/kblink.cpp", + MAME_DIR .. "src/devices/bus/sg1000_exp/kblink.h", } end diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index 654f5bc41ca..4095f62a4c3 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -1297,6 +1297,7 @@ end -------------------------------------------------- -- MIPS R4000 (MIPS III/IV) series --@src/devices/cpu/mips/mips3.h,CPUS["MIPS3"] = true +--@src/devices/cpu/mips/r4000.h,CPUS["MIPS3"] = true -------------------------------------------------- if (CPUS["MIPS3"]~=null) then @@ -1313,6 +1314,8 @@ if (CPUS["MIPS3"]~=null) then MAME_DIR .. "src/devices/cpu/mips/ps2vu.h", MAME_DIR .. "src/devices/cpu/mips/ps2vif1.cpp", MAME_DIR .. "src/devices/cpu/mips/ps2vif1.h", + MAME_DIR .. "src/devices/cpu/mips/r4000.cpp", + MAME_DIR .. "src/devices/cpu/mips/r4000.h", } end @@ -2780,3 +2783,20 @@ if (_OPTIONS["with-tools"]) then table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/nuon/nuondasm.cpp") table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/nuon/nuondasm.h") end + +-------------------------------------------------- +-- DEC Alpha (EV4/EV5/EV6/EV7) series +--@src/devices/cpu/alpha/alpha.h,CPUS["ALPHA"] = true +-------------------------------------------------- + +if (CPUS["ALPHA"]~=null) then + files { + MAME_DIR .. "src/devices/cpu/alpha/alpha.cpp", + MAME_DIR .. "src/devices/cpu/alpha/alpha.h", + } +end + +if (CPUS["ALPHA"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/alpha/alphad.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/alpha/alphad.h") +end diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index 14a2050c3a5..edf745c67d3 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -2914,38 +2914,37 @@ end --------------------------------------------------- -- ---@src/devices/machine/wd11c00_17.h,MACHINES["WD11C00_17"] = true +--@src/devices/machine/wd1010.h,MACHINES["WD1010"] = true --------------------------------------------------- -if (MACHINES["WD11C00_17"]~=null) then +if (MACHINES["WD1010"]~=null) then files { - MAME_DIR .. "src/devices/machine/wd11c00_17.cpp", - MAME_DIR .. "src/devices/machine/wd11c00_17.h", + MAME_DIR .. "src/devices/machine/wd1010.cpp", + MAME_DIR .. "src/devices/machine/wd1010.h", } end --------------------------------------------------- -- ---@src/devices/machine/wd2010.h,MACHINES["WD2010"] = true +--@src/devices/machine/wd11c00_17.h,MACHINES["WD11C00_17"] = true --------------------------------------------------- -if (MACHINES["WD2010"]~=null) then +if (MACHINES["WD11C00_17"]~=null) then files { - MAME_DIR .. "src/devices/machine/wd2010.cpp", - MAME_DIR .. "src/devices/machine/wd2010.h", + MAME_DIR .. "src/devices/machine/wd11c00_17.cpp", + MAME_DIR .. "src/devices/machine/wd11c00_17.h", } end --------------------------------------------------- -- ---@src/devices/machine/wd33c93.h,MACHINES["WD33C93"] = true +--@src/devices/machine/wd2010.h,MACHINES["WD2010"] = true --------------------------------------------------- -if (MACHINES["WD33C93"]~=null) then - MACHINES["SCSI"] = true +if (MACHINES["WD2010"]~=null) then files { - MAME_DIR .. "src/devices/machine/wd33c93.cpp", - MAME_DIR .. "src/devices/machine/wd33c93.h", + MAME_DIR .. "src/devices/machine/wd2010.cpp", + MAME_DIR .. "src/devices/machine/wd2010.h", } end @@ -3869,4 +3868,28 @@ if (MACHINES["DC7085"]~=null) then MAME_DIR .. "src/devices/machine/dc7085.cpp", MAME_DIR .. "src/devices/machine/dc7085.h", } -end
\ No newline at end of file +end + +--------------------------------------------------- +-- +--@src/devices/machine/i82357.h,MACHINES["I82357"] = true +--------------------------------------------------- + +if (MACHINES["I82357"]~=null) then + files { + MAME_DIR .. "src/devices/machine/i82357.cpp", + MAME_DIR .. "src/devices/machine/i82357.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/machine/xc1700e.h,MACHINES["XC1700E"] = true +--------------------------------------------------- + +if (MACHINES["XC1700E"]~=null) then + files { + MAME_DIR .. "src/devices/machine/xc1700e.cpp", + MAME_DIR .. "src/devices/machine/xc1700e.h", + } +end diff --git a/scripts/src/main.lua b/scripts/src/main.lua index bec62ff6f49..ad0e1a1d08c 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -256,6 +256,7 @@ end "utils", ext_lib("expat"), "softfloat", + "softfloat3", ext_lib("jpeg"), "7z", } @@ -419,6 +420,13 @@ if (STANDALONE~=true) then "@echo Emitting ".. rctarget .. "vers.rc...", PYTHON .. " \"" .. path.translate(MAME_DIR .. "scripts/build/verinfo.py","\\") .. "\" -r -b " .. rctarget .. " \"" .. path.translate(GEN_DIR .. "version.cpp","\\") .. "\" > \"" .. path.translate(GEN_DIR .. "resource/" .. rctarget .. "vers.rc", "\\") .. "\"" , } + + configuration { "vsllvm" } + prebuildcommands { + "mkdir \"" .. path.translate(GEN_DIR .. "resource/","\\") .. "\" 2>NUL", + "@echo Emitting ".. rctarget .. "vers.rc...", + PYTHON .. " \"" .. path.translate(MAME_DIR .. "scripts/build/verinfo.py","\\") .. "\" -r -b " .. rctarget .. " \"" .. path.translate(GEN_DIR .. "version.cpp","\\") .. "\" > \"" .. path.translate(GEN_DIR .. "resource/" .. rctarget .. "vers.rc", "\\") .. "\"" , + } end configuration { } diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua index f986ead5f31..09575cacffc 100644 --- a/scripts/src/netlist.lua +++ b/scripts/src/netlist.lua @@ -32,6 +32,7 @@ project "netlist" includedirs { MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib/netlist", } files { @@ -47,9 +48,8 @@ project "netlist" 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_types.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", @@ -64,6 +64,7 @@ project "netlist" MAME_DIR .. "src/lib/netlist/plib/pdynlib.h", MAME_DIR .. "src/lib/netlist/plib/pmain.cpp", MAME_DIR .. "src/lib/netlist/plib/pmain.h", + MAME_DIR .. "src/lib/netlist/plib/pmempool.h", MAME_DIR .. "src/lib/netlist/plib/pomp.h", MAME_DIR .. "src/lib/netlist/plib/poptions.cpp", MAME_DIR .. "src/lib/netlist/plib/poptions.h", @@ -74,10 +75,9 @@ project "netlist" 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/pstring.cpp", - MAME_DIR .. "src/lib/netlist/plib/pstring.h", MAME_DIR .. "src/lib/netlist/plib/pstream.cpp", MAME_DIR .. "src/lib/netlist/plib/pstream.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", diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 9ef57e0ba7c..c9a63dcb24e 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -52,16 +52,16 @@ function maintargetosdoptions(_target,_subtarget) configuration { "mingw*"} links { "SDL2", - "Imm32", - "Version", - "Ole32", - "OleAut32", + "imm32", + "version", + "ole32", + "oleaut32", } configuration { "vs*" } links { "SDL2", - "Imm32", - "Version", + "imm32", + "version", } configuration { } else @@ -74,8 +74,8 @@ function maintargetosdoptions(_target,_subtarget) configuration { "vs*" } links { "SDL2", - "Imm32", - "Version", + "imm32", + "version", } configuration { } else @@ -91,11 +91,11 @@ function maintargetosdoptions(_target,_subtarget) libdirs { path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64") } + configuration { } end links { "psapi", } - configuration {} elseif _OPTIONS["targetos"]=="haiku" then links { "network", @@ -107,7 +107,7 @@ function maintargetosdoptions(_target,_subtarget) targetprefix "sdl" links { "psapi", - "Ole32", + "ole32", } configuration { } diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index 00432b75a8e..ecb3030c683 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -44,6 +44,7 @@ function maintargetosdoptions(_target,_subtarget) "comdlg32", "psapi", "ole32", + "shlwapi", } end diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua index 8fdbbbd72a0..f2d6c9b979d 100644 --- a/scripts/src/sound.lua +++ b/scripts/src/sound.lua @@ -642,7 +642,6 @@ end --------------------------------------------------- -- Nintendo custom sound chips --@src/devices/sound/nes_apu.h,SOUNDS["NES_APU"] = true ---@src/devices/sound/nes_vt_apu.h,SOUNDS["NES_APU"] = true --------------------------------------------------- if (SOUNDS["NES_APU"]~=null) then @@ -650,8 +649,6 @@ if (SOUNDS["NES_APU"]~=null) then MAME_DIR .. "src/devices/sound/nes_apu.cpp", MAME_DIR .. "src/devices/sound/nes_apu.h", MAME_DIR .. "src/devices/sound/nes_defs.h", - MAME_DIR .. "src/devices/sound/nes_vt_apu.cpp", - MAME_DIR .. "src/devices/sound/nes_vt_apu.h" } end diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index 4073f9c7336..564653f5a4a 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -499,6 +499,7 @@ links { includedirs { MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib/netlist", } files { @@ -543,6 +544,7 @@ links { includedirs { MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib/netlist", } files { @@ -741,6 +743,7 @@ files { MAME_DIR .. "src/tools/imgtool/modules/hp48.cpp", MAME_DIR .. "src/tools/imgtool/modules/hp9845_tape.cpp", MAME_DIR .. "src/tools/imgtool/modules/hp85_tape.cpp", + MAME_DIR .. "src/tools/imgtool/modules/rt11.cpp", } configuration { "mingw*" or "vs*" } @@ -791,3 +794,98 @@ if _OPTIONS["targetos"] == "macosx" then strip() end + +-------------------------------------------------- +-- testkeys +-------------------------------------------------- + +if (_OPTIONS["osd"] == "sdl") then + project("testkeys") + uuid ("b3f5a5b8-3203-11e9-93e4-670b4f4e359d") + kind "ConsoleApp" + + flags { + "Symbols", -- always include minimum symbols for executables + } + + if _OPTIONS["SEPARATE_BIN"]~="1" then + targetdir(MAME_DIR) + end + + links { + "ocore_" .. _OPTIONS["osd"], + ext_lib("utf8proc"), + } + + if _OPTIONS["targetos"]=="windows" then + if _OPTIONS["with-bundled-sdl2"]~=nil then + configuration { "mingw*"} + links { + "SDL2", + "imm32", + "version", + "ole32", + "oleaut32", + } + configuration { "vs*" } + links { + "SDL2", + "imm32", + "version", + } + configuration { } + else + if _OPTIONS["USE_LIBSDL"]~="1" then + configuration { "mingw*"} + links { + "SDL2main", + "SDL2", + } + configuration { "vs*" } + links { + "SDL2", + "imm32", + "version", + } + configuration { } + else + local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'") + addlibfromstring(str) + addoptionsfromstring(str) + end + configuration { "x32", "vs*" } + libdirs { + path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x86") + } + configuration { "x64", "vs*" } + libdirs { + path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64") + } + end + end + + if BASE_TARGETOS=="unix" then + if _OPTIONS["with-bundled-sdl2"]~=nil then + links { + "SDL2", + } + end + end + + dofile("osd/sdl_cfg.lua") + + includedirs { + MAME_DIR .. "src/osd", + } + + files { + MAME_DIR .. "src/tools/testkeys.cpp", + } + + configuration { "mingw*" or "vs*" } + targetextension ".exe" + + configuration { } + + strip() +end diff --git a/scripts/src/video.lua b/scripts/src/video.lua index 3f78a2a154a..3508f260eff 100644 --- a/scripts/src/video.lua +++ b/scripts/src/video.lua @@ -115,6 +115,18 @@ end -------------------------------------------------- -- +--@src/devices/video/crt9028.h,VIDEOS["CRT9028"] = true +-------------------------------------------------- + +if (VIDEOS["CRT9028"]~=null) then + files { + MAME_DIR .. "src/devices/video/crt9028.cpp", + MAME_DIR .. "src/devices/video/crt9028.h", + } +end + +-------------------------------------------------- +-- --@src/devices/video/crt9212.h,VIDEOS["CRT9212"] = true -------------------------------------------------- |