diff options
author | 2021-11-24 14:03:41 +1100 | |
---|---|---|
committer | 2021-11-24 14:03:41 +1100 | |
commit | 32784fab1e754120143564671bb597d5097826ae (patch) | |
tree | 4e54cfcc5e4dafc0e887b1877d895c863cbd2612 /docs/release/scripts/src | |
parent | 44a5a57d0eefc1aeafb00d42f91e2100e186a71c (diff) |
0.238 filestag238
Diffstat (limited to 'docs/release/scripts/src')
-rw-r--r-- | docs/release/scripts/src/3rdparty.lua | 114 | ||||
-rw-r--r-- | docs/release/scripts/src/bus.lua | 90 | ||||
-rw-r--r-- | docs/release/scripts/src/cpu.lua | 2 | ||||
-rw-r--r-- | docs/release/scripts/src/lib.lua | 2 | ||||
-rw-r--r-- | docs/release/scripts/src/machine.lua | 49 | ||||
-rw-r--r-- | docs/release/scripts/src/main.lua | 61 | ||||
-rw-r--r-- | docs/release/scripts/src/mame/frontend.lua | 4 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/modules.lua | 7 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/sdl.lua | 6 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/windows.lua | 1 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/winui.lua | 2 | ||||
-rw-r--r-- | docs/release/scripts/src/tests.lua | 4 |
12 files changed, 168 insertions, 174 deletions
diff --git a/docs/release/scripts/src/3rdparty.lua b/docs/release/scripts/src/3rdparty.lua index fff3b94f0c8..267b19d44df 100644 --- a/docs/release/scripts/src/3rdparty.lua +++ b/docs/release/scripts/src/3rdparty.lua @@ -573,11 +573,6 @@ if _OPTIONS["vs"]=="intel-15" then } end - configuration { "winstore*" } - defines { - "NO_GETENV" - } - configuration { } files { @@ -667,12 +662,6 @@ end "-include stdint.h" } - configuration { "vsllvm" } - buildoptions { - "-Wno-enum-conversion", - "-Wno-unused-function", - } - configuration { } defines { "WORDS_BIGENDIAN=0", @@ -774,11 +763,6 @@ if _OPTIONS["vs"]=="intel-15" then "/Qwd869", -- remark #869: parameter "xxx" was never referenced } end - configuration { "winstore*" } - forcedincludes { - MAME_DIR .. "src/osd/uwp/uwpcompat.h" - } - configuration { } defines { "_7ZIP_PPMD_SUPPPORT", @@ -867,27 +851,17 @@ if _OPTIONS["vs"]=="intel-15" then } end - configuration { "winstore*" } - forcedincludes { - MAME_DIR .. "src/osd/uwp/uwpcompat.h", - } - configuration { } defines { "LUA_COMPAT_ALL", "LUA_COMPAT_5_1", "LUA_COMPAT_5_2", } - if not (_OPTIONS["targetos"]=="windows") and not (_OPTIONS["targetos"]=="asmjs") and not (_OPTIONS["targetos"]=="pnacl") then + if not (_OPTIONS["targetos"]=="windows") and not (_OPTIONS["targetos"]=="asmjs") then defines { "LUA_USE_POSIX", } end - if ("pnacl" == _OPTIONS["gcc"]) then - defines { - "LUA_32BITS", - } - end configuration { } @@ -953,11 +927,6 @@ project "lualibs" "/wd4130", -- warning C4130: '==': logical operation on address of string constant } - configuration { "pnacl"} - buildoptions { - "-Wno-char-subscripts", - } - configuration { } defines { "LUA_COMPAT_ALL", @@ -965,39 +934,23 @@ project "lualibs" includedirs { MAME_DIR .. "3rdparty", - } -if (_OPTIONS["osd"] ~= "uwp") then - includedirs { MAME_DIR .. "3rdparty/linenoise", } -end + includedirs { ext_includedir("lua"), ext_includedir("zlib"), ext_includedir("sqlite3"), } - configuration { "winstore*" } - forcedincludes { - MAME_DIR .. "src/osd/uwp/uwpcompat.h" - } - configuration {} files { MAME_DIR .. "3rdparty/lsqlite3/lsqlite3.c", MAME_DIR .. "3rdparty/lua-zlib/lua_zlib.c", MAME_DIR .. "3rdparty/luafilesystem/src/lfs.c", - } -if (_OPTIONS["osd"] == "uwp") then - files { - MAME_DIR .. "3rdparty/lua-linenoise/linenoise_none.c", - } -else - files { MAME_DIR .. "3rdparty/lua-linenoise/linenoise.c", } -end -------------------------------------------------- -- SQLite3 library objects @@ -1026,16 +979,6 @@ if _OPTIONS["vs"]=="clangcl" then "-Wno-implicit-int-float-conversion", } end - configuration { "winstore*" } - defines { - "SQLITE_OS_WINRT", - } - - configuration { "vsllvm" } - buildoptions { - "-Wno-deprecated-declarations", - "-Wno-unused-variable", - } configuration { } @@ -1160,7 +1103,7 @@ project "bx" MAME_DIR .. "3rdparty/bx/include/compat/mingw", } - configuration { "osx* or xcode4" } + configuration { "osx*" } includedirs { MAME_DIR .. "3rdparty/bx/include/compat/osx", } @@ -1228,7 +1171,7 @@ project "bimg" MAME_DIR .. "3rdparty/bx/include/compat/mingw", } - configuration { "osx* or xcode4" } + configuration { "osx*" } includedirs { MAME_DIR .. "3rdparty/bx/include/compat/osx", } @@ -1253,6 +1196,11 @@ project "bimg" end end + configuration { "gmake" } + buildoptions { + "-Wno-unused-but-set-variable", + } + defines { "__STDC_LIMIT_MACROS", "__STDC_FORMAT_MACROS", @@ -1300,12 +1248,6 @@ project "bgfx" "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used } - 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" @@ -1321,13 +1263,9 @@ end MAME_DIR .. "3rdparty/bx/include", MAME_DIR .. "3rdparty/bimg/include", MAME_DIR .. "3rdparty/bgfx/3rdparty/dxsdk/include", + MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", } - configuration { "not steamlink"} - includedirs { - MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", - } - configuration { "android-*"} buildoptions { "-Wno-macro-redefined", @@ -1342,7 +1280,7 @@ end MAME_DIR .. "3rdparty/bx/include/compat/mingw", } - configuration { "osx* or xcode4" } + configuration { "osx*" } includedirs { MAME_DIR .. "3rdparty/bx/include/compat/osx", } @@ -1364,14 +1302,6 @@ end "-Wno-unused-function", "-Wno-unused-variable", } - configuration { "rpi" } - buildoptions { - "-Wno-unused-but-set-variable", - "-Wno-unused-variable", - } - defines { - "__STDC_VERSION__=199901L", - } configuration { } @@ -1512,15 +1442,6 @@ project "portaudio" } end - configuration { "vsllvm" } - buildoptions { - "-Wno-deprecated-declarations", - "-Wno-missing-braces", - "-Wno-switch", - "-Wno-unused-function", - "-Wno-unused-variable", - } - configuration { "gmake or ninja" } buildoptions_c { "-Wno-bad-function-cast", @@ -1686,12 +1607,6 @@ if _OPTIONS["targetos"]=="android" then if _OPTIONS["PLATFORM"]=="arm64" then targetdir(MAME_DIR .. "android-project/app/src/main/libs/arm64-v8a") end - if _OPTIONS["PLATFORM"]=="mips" then - targetdir(MAME_DIR .. "android-project/app/src/main/libs/mips") - end - if _OPTIONS["PLATFORM"]=="mips64" then - targetdir(MAME_DIR .. "android-project/app/src/main/libs/mips64") - end if _OPTIONS["PLATFORM"]=="x86" then targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86") end @@ -2174,7 +2089,6 @@ end -- linenoise library -------------------------------------------------- -if (_OPTIONS["osd"] ~= "uwp") then project "linenoise" uuid "7320ffc8-2748-4add-8864-ae29b72a8511" kind (LIBTYPE) @@ -2196,7 +2110,6 @@ project "linenoise" MAME_DIR .. "3rdparty/linenoise/utf8.c", MAME_DIR .. "3rdparty/linenoise/linenoise.c", } -end -------------------------------------------------- @@ -2312,6 +2225,11 @@ project "asmjit" end end + configuration { "gmake" } + buildoptions { + "-Wno-unused-but-set-variable", + } + files { MAME_DIR .. "3rdparty/asmjit/src/asmjit/asmjit.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core.h", diff --git a/docs/release/scripts/src/bus.lua b/docs/release/scripts/src/bus.lua index cb898a2a4c9..5be5a3361fb 100644 --- a/docs/release/scripts/src/bus.lua +++ b/docs/release/scripts/src/bus.lua @@ -316,6 +316,82 @@ end --------------------------------------------------- -- +--@src/devices/bus/archimedes/econet/slot.h,BUSES["ARCHIMEDES_ECONET"] = true +--------------------------------------------------- + +if (BUSES["ARCHIMEDES_ECONET"]~=null) then + files { + MAME_DIR .. "src/devices/bus/archimedes/econet/slot.cpp", + MAME_DIR .. "src/devices/bus/archimedes/econet/slot.h", + MAME_DIR .. "src/devices/bus/archimedes/econet/econet.cpp", + MAME_DIR .. "src/devices/bus/archimedes/econet/econet.h", + MAME_DIR .. "src/devices/bus/archimedes/econet/rtfmjoy.cpp", + MAME_DIR .. "src/devices/bus/archimedes/econet/rtfmjoy.h", + } +end + + +--------------------------------------------------- +-- +--@src/devices/bus/archimedes/podule/slot.h,BUSES["ARCHIMEDES_PODULE"] = true +--------------------------------------------------- + +if (BUSES["ARCHIMEDES_PODULE"]~=null) then + files { + MAME_DIR .. "src/devices/bus/archimedes/podule/slot.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/slot.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/a448.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/a448.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/armadeus.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/armadeus.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/eaglem2.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/eaglem2.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/ether1.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/ether1.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/etherd.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/etherd.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/etherr.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/etherr.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/faxpack.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/faxpack.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/ide_be.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/ide_be.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/ide_rdev.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/ide_rdev.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/io.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/io.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/io_hccs.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/io_hccs.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/io_morley.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/io_morley.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/io_we.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/io_we.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/lark.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/lark.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/laserd.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/laserd.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/midimax.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/midimax.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/nexus.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/nexus.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/rom.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/rom.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/rs423.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/rs423.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/scanlight.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/scanlight.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/scsi_vti.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/scsi_vti.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/serial.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/serial.h", + MAME_DIR .. "src/devices/bus/archimedes/podule/tube.cpp", + MAME_DIR .. "src/devices/bus/archimedes/podule/tube.h", + } +end + + +--------------------------------------------------- +-- --@src/devices/bus/astrocde/slot.h,BUSES["ASTROCADE"] = true --------------------------------------------------- @@ -2300,6 +2376,8 @@ if (BUSES["VME"]~=null) then 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_mvme120.cpp", + MAME_DIR .. "src/devices/bus/vme/vme_mvme120.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", @@ -2666,6 +2744,8 @@ if (BUSES["CENTRONICS"]~=null) then MAME_DIR .. "src/devices/bus/centronics/samdac.h", MAME_DIR .. "src/devices/bus/centronics/smartboard.cpp", MAME_DIR .. "src/devices/bus/centronics/smartboard.h", + MAME_DIR .. "src/devices/bus/centronics/spjoy.cpp", + MAME_DIR .. "src/devices/bus/centronics/spjoy.h", } dependency { @@ -2910,12 +2990,16 @@ if (BUSES["NES_CTRL"]~=null) then MAME_DIR .. "src/devices/bus/nes_ctrl/arkpaddle.h", MAME_DIR .. "src/devices/bus/nes_ctrl/bcbattle.cpp", MAME_DIR .. "src/devices/bus/nes_ctrl/bcbattle.h", - MAME_DIR .. "src/devices/bus/nes_ctrl/ftrainer.cpp", - MAME_DIR .. "src/devices/bus/nes_ctrl/ftrainer.h", + MAME_DIR .. "src/devices/bus/nes_ctrl/dorepiano.cpp", + MAME_DIR .. "src/devices/bus/nes_ctrl/dorepiano.h", MAME_DIR .. "src/devices/bus/nes_ctrl/fckeybrd.cpp", MAME_DIR .. "src/devices/bus/nes_ctrl/fckeybrd.h", + MAME_DIR .. "src/devices/bus/nes_ctrl/fcmat.cpp", + MAME_DIR .. "src/devices/bus/nes_ctrl/fcmat.h", MAME_DIR .. "src/devices/bus/nes_ctrl/hori.cpp", MAME_DIR .. "src/devices/bus/nes_ctrl/hori.h", + MAME_DIR .. "src/devices/bus/nes_ctrl/konamibag.cpp", + MAME_DIR .. "src/devices/bus/nes_ctrl/konamibag.h", MAME_DIR .. "src/devices/bus/nes_ctrl/konamihs.cpp", MAME_DIR .. "src/devices/bus/nes_ctrl/konamihs.h", MAME_DIR .. "src/devices/bus/nes_ctrl/miracle.cpp", @@ -3422,6 +3506,8 @@ if (BUSES["TI99"]~=null) then MAME_DIR .. "src/devices/bus/ti99/peb/pgram.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/scsicard.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/scsicard.h", MAME_DIR .. "src/devices/bus/ti99/peb/sidmaster.cpp", MAME_DIR .. "src/devices/bus/ti99/peb/sidmaster.h", MAME_DIR .. "src/devices/bus/ti99/peb/spchsyn.cpp", diff --git a/docs/release/scripts/src/cpu.lua b/docs/release/scripts/src/cpu.lua index 9c612457313..78f18f4430a 100644 --- a/docs/release/scripts/src/cpu.lua +++ b/docs/release/scripts/src/cpu.lua @@ -160,6 +160,8 @@ if CPUS["ARM7"] then MAME_DIR .. "src/devices/cpu/arm7/arm7ops.cpp", MAME_DIR .. "src/devices/cpu/arm7/lpc210x.cpp", MAME_DIR .. "src/devices/cpu/arm7/lpc210x.h", + MAME_DIR .. "src/devices/cpu/arm7/upd800468.cpp", + MAME_DIR .. "src/devices/cpu/arm7/upd800468.h", MAME_DIR .. "src/devices/cpu/arm7/arm7core.h", MAME_DIR .. "src/devices/cpu/arm7/arm7core.hxx", MAME_DIR .. "src/devices/cpu/arm7/arm7drc.hxx", diff --git a/docs/release/scripts/src/lib.lua b/docs/release/scripts/src/lib.lua index 6b1bd29e3ea..1cb1ce50f60 100644 --- a/docs/release/scripts/src/lib.lua +++ b/docs/release/scripts/src/lib.lua @@ -89,6 +89,8 @@ end MAME_DIR .. "src/lib/util/ioprocsvec.h", MAME_DIR .. "src/lib/util/jedparse.cpp", MAME_DIR .. "src/lib/util/jedparse.h", + MAME_DIR .. "src/lib/util/language.cpp", + MAME_DIR .. "src/lib/util/language.h", MAME_DIR .. "src/lib/util/lrucache.h", MAME_DIR .. "src/lib/util/md5.cpp", MAME_DIR .. "src/lib/util/md5.h", diff --git a/docs/release/scripts/src/machine.lua b/docs/release/scripts/src/machine.lua index 1dd90ed1a59..cd9d91c9a9e 100644 --- a/docs/release/scripts/src/machine.lua +++ b/docs/release/scripts/src/machine.lua @@ -70,6 +70,18 @@ files { } +--------------------------------------------------- +-- +--@src/devices/machine/acorn_bmu.h,MACHINES["ACORN_BMU"] = true +--------------------------------------------------- + +if (MACHINES["ACORN_BMU"]~=null) then + files { + MAME_DIR .. "src/devices/machine/acorn_bmu.cpp", + MAME_DIR .. "src/devices/machine/acorn_bmu.h", + } +end + -------------------------------------------------- -- --@src/devices/machine/acorn_ioc.h,MACHINES["ACORN_IOC"] = true @@ -82,6 +94,18 @@ if (MACHINES["ACORN_IOC"]~=null) then } end +--------------------------------------------------- +-- +--@src/devices/machine/acorn_lc.h,MACHINES["ACORN_LC"] = true +--------------------------------------------------- + +if (MACHINES["ACORN_LC"]~=null) then + files { + MAME_DIR .. "src/devices/machine/acorn_lc.cpp", + MAME_DIR .. "src/devices/machine/acorn_lc.h", + } +end + -------------------------------------------------- -- --@src/devices/machine/acorn_memc.h,MACHINES["ACORN_MEMC"] = true @@ -3179,6 +3203,7 @@ if (MACHINES["SPG290"]~=null) then MAME_DIR .. "src/devices/machine/spg290_ppu.h", } end + --------------------------------------------------- -- --@src/devices/machine/stvcd.h,MACHINES["STVCD"] = true @@ -3454,6 +3479,30 @@ end --------------------------------------------------- -- +--@src/devices/machine/upc82c710.h,MACHINES["UPC82C710"] = true +--------------------------------------------------- + +if (MACHINES["UPC82C710"]~=null) then + files { + MAME_DIR .. "src/devices/machine/upc82c710.cpp", + MAME_DIR .. "src/devices/machine/upc82c710.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/machine/upc82c711.h,MACHINES["UPC82C711"] = true +--------------------------------------------------- + +if (MACHINES["UPC82C711"]~=null) then + files { + MAME_DIR .. "src/devices/machine/upc82c711.cpp", + MAME_DIR .. "src/devices/machine/upc82c711.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/upd1990a.h,MACHINES["UPD1990A"] = true --------------------------------------------------- diff --git a/docs/release/scripts/src/main.lua b/docs/release/scripts/src/main.lua index 985afcf2cda..8183f5b8748 100644 --- a/docs/release/scripts/src/main.lua +++ b/docs/release/scripts/src/main.lua @@ -40,17 +40,6 @@ end "GLESv2", "SDL2", } - configuration { "pnacl" } - kind "ConsoleApp" - targetextension ".pexe" - links { - "ppapi", - "ppapi_gles2", - "pthread", - } - - configuration { "winstore*" } - kind "WindowedApp" configuration { } @@ -68,36 +57,6 @@ end } end - configuration { "winstore*" } - -- Windows Required Files - files { - -- Manifest file - MAME_DIR .. "scripts/resources/uwp/Package.appxmanifest", - } - - configuration { "winstore*" } - files { - MAME_DIR .. "scripts/resources/uwp/assets/*.png" - } - configuration "**/scripts/resources/uwp/assets/*.png" - flags { "DeploymentContent" } - - -- Effects and Shaders - configuration { "winstore*" } - files { - MAME_DIR .. "artwork/*", - MAME_DIR .. "artwork/**/*", - MAME_DIR .. "bgfx/*", - MAME_DIR .. "bgfx/**/*", - MAME_DIR .. "hash/*", - MAME_DIR .. "language/*", - MAME_DIR .. "language/**/*", - MAME_DIR .. "plugins/*", - MAME_DIR .. "plugins/**/*", - } - configuration "**/*" - flags { "DeploymentContent" } - configuration { "x64", "Release" } targetsuffix "" if _OPTIONS["PROFILE"] then @@ -125,9 +84,6 @@ end configuration { "mingw*" or "vs20*" } targetextension ".exe" - configuration { "rpi" } - targetextension "" - configuration { "asmjs" } targetextension ".bc" if os.getenv("EMSCRIPTEN") then @@ -204,12 +160,6 @@ end if _OPTIONS["PLATFORM"]=="arm64" then targetdir(MAME_DIR .. "android-project/app/src/main/libs/arm64-v8a") end - if _OPTIONS["PLATFORM"]=="mips" then - targetdir(MAME_DIR .. "android-project/app/src/main/libs/mips") - end - if _OPTIONS["PLATFORM"]=="mips64" then - targetdir(MAME_DIR .. "android-project/app/src/main/libs/mips64") - end if _OPTIONS["PLATFORM"]=="x86" then targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86") end @@ -275,13 +225,9 @@ if (STANDALONE~=true) then links { ext_lib("lua"), "lualibs", - } -if (_OPTIONS["osd"] ~= "uwp") then - links { "linenoise", } end -end links { ext_lib("zlib"), ext_lib("flac"), @@ -432,13 +378,6 @@ 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/docs/release/scripts/src/mame/frontend.lua b/docs/release/scripts/src/mame/frontend.lua index 91d60cf6587..a31172764d9 100644 --- a/docs/release/scripts/src/mame/frontend.lua +++ b/docs/release/scripts/src/mame/frontend.lua @@ -143,6 +143,8 @@ files { MAME_DIR .. "src/frontend/mame/ui/optsmenu.h", MAME_DIR .. "src/frontend/mame/ui/pluginopt.cpp", MAME_DIR .. "src/frontend/mame/ui/pluginopt.h", + MAME_DIR .. "src/frontend/mame/ui/quitmenu.cpp", + MAME_DIR .. "src/frontend/mame/ui/quitmenu.h", MAME_DIR .. "src/frontend/mame/ui/selector.cpp", MAME_DIR .. "src/frontend/mame/ui/selector.h", MAME_DIR .. "src/frontend/mame/ui/selgame.cpp", @@ -171,6 +173,8 @@ files { MAME_DIR .. "src/frontend/mame/ui/tapectrl.h", MAME_DIR .. "src/frontend/mame/ui/text.cpp", MAME_DIR .. "src/frontend/mame/ui/text.h", + MAME_DIR .. "src/frontend/mame/ui/textbox.cpp", + MAME_DIR .. "src/frontend/mame/ui/textbox.h", MAME_DIR .. "src/frontend/mame/ui/toolbar.ipp", MAME_DIR .. "src/frontend/mame/ui/ui.cpp", MAME_DIR .. "src/frontend/mame/ui/ui.h", diff --git a/docs/release/scripts/src/osd/modules.lua b/docs/release/scripts/src/osd/modules.lua index 7ee20732784..e431bb93d22 100644 --- a/docs/release/scripts/src/osd/modules.lua +++ b/docs/release/scripts/src/osd/modules.lua @@ -104,7 +104,6 @@ function osdmodulesbuild() MAME_DIR .. "src/osd/modules/input/input_xinput.cpp", MAME_DIR .. "src/osd/modules/input/input_xinput.h", MAME_DIR .. "src/osd/modules/input/input_winhybrid.cpp", - MAME_DIR .. "src/osd/modules/input/input_uwp.cpp", MAME_DIR .. "src/osd/modules/input/input_mac.cpp", MAME_DIR .. "src/osd/modules/output/output_module.h", MAME_DIR .. "src/osd/modules/output/none.cpp", @@ -123,6 +122,12 @@ function osdmodulesbuild() ext_includedir("asio"), } + if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then + buildoptions { + "-Wno-unused-private-field", + } + end + if _OPTIONS["targetos"]=="windows" then includedirs { MAME_DIR .. "3rdparty/winpcap/Include", diff --git a/docs/release/scripts/src/osd/sdl.lua b/docs/release/scripts/src/osd/sdl.lua index fc8fab036d4..25ef22fd3a5 100644 --- a/docs/release/scripts/src/osd/sdl.lua +++ b/docs/release/scripts/src/osd/sdl.lua @@ -381,12 +381,6 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/sdl", } - if _OPTIONS["targetos"]=="windows" then - files { - MAME_DIR .. "src/osd/windows/main.cpp", - } - end - if _OPTIONS["targetos"]=="macosx" then files { MAME_DIR .. "src/osd/modules/debugger/debugosx.mm", diff --git a/docs/release/scripts/src/osd/windows.lua b/docs/release/scripts/src/osd/windows.lua index 2f77844d17a..2d5ca91cca6 100644 --- a/docs/release/scripts/src/osd/windows.lua +++ b/docs/release/scripts/src/osd/windows.lua @@ -217,7 +217,6 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/strconv.h", MAME_DIR .. "src/osd/osdsync.cpp", MAME_DIR .. "src/osd/osdsync.h", - MAME_DIR .. "src/osd/windows/main.cpp", MAME_DIR .. "src/osd/windows/winutf8.cpp", MAME_DIR .. "src/osd/windows/winutf8.h", MAME_DIR .. "src/osd/windows/winutil.cpp", diff --git a/docs/release/scripts/src/osd/winui.lua b/docs/release/scripts/src/osd/winui.lua index b691f1d701d..b19788e35ec 100644 --- a/docs/release/scripts/src/osd/winui.lua +++ b/docs/release/scripts/src/osd/winui.lua @@ -221,6 +221,7 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/winui/helpids.cpp", MAME_DIR .. "src/osd/winui/history.cpp", MAME_DIR .. "src/osd/winui/layout.cpp", + MAME_DIR .. "src/osd/winui/main.cpp", MAME_DIR .. "src/osd/winui/mui_audit.cpp", MAME_DIR .. "src/osd/winui/mui_main.cpp", MAME_DIR .. "src/osd/winui/mui_opts.cpp", @@ -276,7 +277,6 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/osdcore.h", MAME_DIR .. "src/osd/strconv.cpp", MAME_DIR .. "src/osd/strconv.h", - MAME_DIR .. "src/osd/windows/main.cpp", MAME_DIR .. "src/osd/osdsync.cpp", MAME_DIR .. "src/osd/osdsync.h", MAME_DIR .. "src/osd/windows/winutf8.cpp", diff --git a/docs/release/scripts/src/tests.lua b/docs/release/scripts/src/tests.lua index 89c8c976c39..b0164f6946a 100644 --- a/docs/release/scripts/src/tests.lua +++ b/docs/release/scripts/src/tests.lua @@ -36,10 +36,6 @@ project("mametests") configuration { "mingw*" or "vs*" } targetextension ".exe" - configuration { "rpi" } - targetextension "" - - configuration { } links { |