summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/src')
-rwxr-xr-xscripts/src/3rdparty.lua409
-rw-r--r--scripts/src/bus.lua2
-rw-r--r--scripts/src/cpu.lua4
-rw-r--r--scripts/src/devices.lua1
-rw-r--r--scripts/src/machine.lua24
-rw-r--r--scripts/src/mame/frontend.lua6
-rw-r--r--scripts/src/osd/modules.lua99
-rw-r--r--scripts/src/osd/sdl.lua2
-rw-r--r--scripts/src/osd/sdl3.lua6
-rw-r--r--scripts/src/osd/sdl3_cfg.lua2
-rw-r--r--scripts/src/osd/sdl_cfg.lua2
-rw-r--r--scripts/src/osd/windows_cfg.lua17
-rw-r--r--scripts/src/sound.lua12
-rw-r--r--scripts/src/tools.lua49
14 files changed, 277 insertions, 358 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 011af653653..2d904c12472 100755
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -82,13 +82,6 @@ if _OPTIONS["vs"]==nil then
"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
}
-elseif _OPTIONS["vs"]=="intel-15" then
- buildoptions {
- "/Qwd111", -- remark #111: statement is unreachable
- "/Qwd1879", -- warning #1879: unimplemented pragma ignored
- "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
- }
end
configuration { "gmake or ninja" }
@@ -101,6 +94,12 @@ if _OPTIONS["gcc"]~=nil then
}
end
end
+if _OPTIONS["targetos"]=="windows" then
+ buildoptions_c {
+ "-Wno-error=format", -- GCC with UCRT produces warnings for the non-standard I64 size modifier
+ "-Wno-error=format-extra-args",
+ }
+end
configuration { }
@@ -141,11 +140,6 @@ if _OPTIONS["vs"]==nil then
"/wd4127", -- warning C4127: conditional expression is constant
"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
}
-elseif _OPTIONS["vs"]=="intel-15" then
- buildoptions {
- "/Qwd111", -- remark #111: statement is unreachable
- "/Qwd280", -- remark #280: selector expression is constant
- }
end
configuration "Debug"
defines {
@@ -269,10 +263,6 @@ if _OPTIONS["vs"]==nil then
"/wd4146", -- warning C4146: unary minus operator applied to unsigned type, result still unsigned
"/wd4018", -- warning C4018: 'x' : signed/unsigned mismatch
}
-elseif _OPTIONS["vs"]=="intel-15" then
- buildoptions {
- "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
- }
end
configuration { }
@@ -667,10 +657,6 @@ if _OPTIONS["vs"]==nil then
"/wd4127", -- warning C4127: conditional expression is constant
"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
}
-elseif _OPTIONS["vs"]=="intel-15" then
- buildoptions {
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
- }
end
configuration { }
@@ -749,14 +735,6 @@ if _OPTIONS["vs"]==nil then
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
"/wd4702", -- warning C4702: unreachable code
}
-elseif _OPTIONS["vs"]=="intel-15" then
- buildoptions {
- "/Qwd111", -- remark #111: statement is unreachable
- "/Qwd177", -- remark #177: function "xxx" was declared but never referenced
- "/Qwd181", -- remark #181: argument of type "UINT32={unsigned int}" is incompatible with format "%d", expecting argument of type "int"
- "/Qwd188", -- error #188: enumerated type mixed with another type
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
- }
end
configuration { "mingw*" }
@@ -910,10 +888,6 @@ if _OPTIONS["vs"]==nil then
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
"/wd4457", -- warning C4457: declaration of 'xxx' hides function parameter
}
-elseif _OPTIONS["vs"]=="intel-15" then
- buildoptions {
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
- }
end
configuration { }
defines {
@@ -999,18 +973,9 @@ if _OPTIONS["vs"]==nil then
"/wd4702", -- warning C4702: unreachable code
"/wd4310", -- warning C4310: cast truncates constant value
}
-elseif _OPTIONS["vs"]=="intel-15" then
- buildoptions {
- "/Qwd592", -- error #592: variable "xxx" is used before its value is set
- }
end
configuration { }
- defines {
- "LUA_COMPAT_ALL",
- "LUA_COMPAT_5_1",
- "LUA_COMPAT_5_2",
- }
if (_OPTIONS["targetos"] ~= "windows") and (_OPTIONS["targetos"] ~= "asmjs") then
defines {
"LUA_USE_POSIX",
@@ -1100,9 +1065,6 @@ elseif _OPTIONS["vs"]=="clangcl" then
end
configuration { }
- defines {
- "LUA_COMPAT_ALL",
- }
includedirs {
MAME_DIR .. "3rdparty",
@@ -1199,13 +1161,6 @@ if _OPTIONS["vs"]==nil then
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
"/wd4706", -- warning C4706: assignment within conditional expression
}
-elseif _OPTIONS["vs"]=="intel-15" then
- buildoptions {
- "/Qwd188", -- error #188: enumerated type mixed with another type
- "/Qwd344", -- remark #344: typedef name has already been declared (with same type)
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
- "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
- }
elseif _OPTIONS["vs"]=="clangcl" then
buildoptions {
"-Wno-unused-but-set-variable",
@@ -1507,12 +1462,6 @@ if _OPTIONS["vs"]==nil then
"/wd4310", -- warning C4310: cast truncates constant value
"/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used
}
-elseif _OPTIONS["vs"]=="intel-15" then
- buildoptions {
- "/Qwd906", -- message #906: effect of this "#pragma pack" directive is local to function "xxx"
- "/Qwd1879", -- warning #1879: unimplemented pragma ignored
- "/Qwd82", -- remark #82: storage class is not first
- }
elseif _OPTIONS["vs"]=="clangcl" then
buildoptions {
"-Wno-uninitialized",
@@ -1709,13 +1658,6 @@ if _OPTIONS["vs"]==nil then
"/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used
"/wd4057", -- warning C4057: 'function': 'xxx' differs in indirection to slightly different base types from 'xxx'
}
-elseif _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
- }
elseif _OPTIONS["vs"]=="clangcl" then
buildoptions {
"-Wno-missing-braces",
@@ -2002,175 +1944,178 @@ project "asmjit"
defines {
"ASMJIT_STATIC",
}
+ includedirs {
+ MAME_DIR .. "3rdparty/asmjit",
+ }
files {
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/a64.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64archtraits_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64assembler.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64assembler.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64builder.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64builder.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64compiler.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64compiler.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64emithelper_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64emithelper.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64emitter.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64formatter_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64formatter.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64func_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64func.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64globals.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64instapi_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64instapi.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64instdb_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64instdb.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64instdb.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64operand.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64operand.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64rapass_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64rapass.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/armformatter_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/armformatter.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/armglobals.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/armutils.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/asmjit-scope-begin.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/asmjit-scope-end.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/asmjit.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/api-build_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/api-config.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/archcommons.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/archtraits.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/archtraits.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/arena.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/arena.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/arenabitset.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/arenabitset_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/arenahash.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/arenahash.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/arenalist.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/arenalist.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/arenapool.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/arenastring.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/arenatree.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/arenatree.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/arenavector.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/arenavector.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/assembler.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/assembler.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/builder_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/builder.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/builder.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/codebuffer.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/codeholder.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/codeholder.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/codewriter_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/codewriter.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/compiler.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/compiler.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/compilerdefs.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/constpool.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/constpool.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/cpuinfo.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/cpuinfo.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emithelper_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emithelper.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emitter.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emitter.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emitterutils_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emitterutils.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/environment.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/environment.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/errorhandler.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/errorhandler.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/fixup.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/formatter_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/formatter.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/formatter.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/func.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/func.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/funcargscontext_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/funcargscontext.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/globals.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/globals.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/inst.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/inst.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/instdb_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/instdb.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/jitallocator.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/jitallocator.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/jitruntime.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/jitruntime.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/logger.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/logger.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/misc_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/operand.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/operand.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/osutils_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/osutils.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/osutils.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/raassignment_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/racfgblock_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/racfgbuilder_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/raconstraints_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/radefs_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/rainst_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/ralocal_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/ralocal.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/rapass_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/rapass.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/rareg_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/rastack_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/rastack.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/span.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/string.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/string.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/support_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/support.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/support.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/target.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/target.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/type.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/type.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/virtmem.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/virtmem.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/host.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/ujit.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/ujit/ujitbase.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/ujit/unicompiler.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/ujit/unicompiler_a64.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/ujit/unicompiler_utils_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/ujit/unicompiler_x86.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/ujit/unicondition.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/ujit/uniop.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/ujit/vecconsttable.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/ujit/vecconsttable.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86archtraits_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86assembler.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86assembler.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86builder.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86builder.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86compiler.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86compiler.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86emithelper_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86emithelper.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86emitter.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86formatter_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86formatter.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86func_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86func.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86globals.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86instapi_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86instapi.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86instdb_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86instdb.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86instdb.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86opcode_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86operand.cpp",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86operand.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86rapass_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86rapass.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/a64.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64archtraits_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64assembler.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64assembler.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64builder.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64builder.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64compiler.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64compiler.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64emithelper.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64emithelper_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64emitter.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64formatter.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64formatter_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64func.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64func_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64globals.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64instapi.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64instapi_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64instdb.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64instdb.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64instdb_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64operand.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64operand.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64rapass.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/a64rapass_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/armformatter.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/armformatter_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/armglobals.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/arm/armutils.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/asmjit.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/asmjit-scope-begin.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/asmjit-scope-end.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/api-build_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/api-config.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/archcommons.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/archtraits.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/archtraits.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/assembler.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/assembler.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/builder.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/builder.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/builder_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/codebuffer.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/codeholder.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/codeholder.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/codewriter.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/codewriter_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/compiler.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/compiler.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/compilerdefs.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/constpool.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/constpool.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/cpuinfo.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/cpuinfo.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/emithelper.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/emithelper_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/emitter.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/emitter.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/emitterutils.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/emitterutils_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/environment.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/environment.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/errorhandler.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/errorhandler.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/fixup.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/formatter.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/formatter.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/formatter_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/func.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/func.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/funcargscontext.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/funcargscontext_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/globals.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/globals.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/inst.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/inst.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/instdb.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/instdb_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/jitallocator.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/jitallocator.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/jitruntime.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/jitruntime.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/logger.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/logger.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/misc_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/operand.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/operand.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/osutils.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/osutils.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/osutils_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/raassignment_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/racfgblock_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/racfgbuilder_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/raconstraints_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/radefs_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/rainst_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/ralocal.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/ralocal_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/rapass.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/rapass_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/rareg_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/rastack.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/rastack_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/string.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/string.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/target.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/target.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/type.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/type.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/virtmem.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/core/virtmem.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/host.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/support/arena.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/support/arena.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/support/arenabitset.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/support/arenabitset_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/support/arenahash.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/support/arenahash.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/support/arenalist.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/support/arenalist.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/support/arenapool.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/support/arenastring.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/support/arenatree.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/support/arenatree.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/support/arenavector.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/support/arenavector.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/support/span.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/support/support.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/support/support.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/support/support_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/ujit.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/ujit/ujitbase.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/ujit/unicompiler.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/ujit/unicompiler_a64.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/ujit/unicompiler_utils_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/ujit/unicompiler_x86.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/ujit/unicondition.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/ujit/uniop.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/ujit/vecconsttable.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/ujit/vecconsttable.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86archtraits_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86assembler.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86assembler.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86builder.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86builder.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86compiler.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86compiler.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86emithelper.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86emithelper_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86emitter.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86formatter.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86formatter_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86func.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86func_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86globals.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86instapi.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86instapi_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86instdb.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86instdb.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86instdb_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86opcode_p.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86operand.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86operand.h",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86rapass.cpp",
+ MAME_DIR .. "3rdparty/asmjit/asmjit/x86/x86rapass_p.h",
}
end
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index 5bc9cbd54ee..7f573180de6 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -2525,6 +2525,8 @@ if BUSES["HP_DIO"] then
files {
MAME_DIR .. "src/devices/bus/hp_dio/hp_dio.cpp",
MAME_DIR .. "src/devices/bus/hp_dio/hp_dio.h",
+ MAME_DIR .. "src/devices/bus/hp_dio/hp98259.cpp",
+ MAME_DIR .. "src/devices/bus/hp_dio/hp98259.h",
MAME_DIR .. "src/devices/bus/hp_dio/hp98265a.cpp",
MAME_DIR .. "src/devices/bus/hp_dio/hp98265a.h",
MAME_DIR .. "src/devices/bus/hp_dio/hp98543.cpp",
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index f6922a00a9f..743d36f279a 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -13,7 +13,7 @@
-- Dynamic recompiler objects
--------------------------------------------------
-DRC_CPUS = { "E1", "SH", "MIPS3", "POWERPC", "ADSP21062", "MB86235", "DSP16", "UNSP", "SWP30", "DSPP" }
+DRC_CPUS = { "ADSP21062", "DSP16", "DSPP", "E1", "MB86235", "MIPS3", "POWERPC", "SH", "SWP30", "UNSP" }
CPU_INCLUDE_DRC = false
for i, v in ipairs(DRC_CPUS) do
if (CPUS[v]~=null) then
@@ -49,8 +49,6 @@ if CPU_INCLUDE_DRC_NATIVE then
MAME_DIR .. "src/devices/cpu/drcbearm64.h",
MAME_DIR .. "src/devices/cpu/drcbex64.cpp",
MAME_DIR .. "src/devices/cpu/drcbex64.h",
- MAME_DIR .. "src/devices/cpu/drcbex86.cpp",
- MAME_DIR .. "src/devices/cpu/drcbex86.h",
}
end
diff --git a/scripts/src/devices.lua b/scripts/src/devices.lua
index 1e3f31d0b80..ecf457bb9ef 100644
--- a/scripts/src/devices.lua
+++ b/scripts/src/devices.lua
@@ -36,6 +36,7 @@ function devicesProject(_target, _subtarget)
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
+ MAME_DIR .. "3rdparty/asmjit", -- required by asmjit internal use of #include <...> syntax
GEN_DIR .. "emu",
GEN_DIR .. "emu/layout",
ext_includedir("asio"),
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index 20476e7d3a8..874842acad6 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -1645,6 +1645,18 @@ end
---------------------------------------------------
--
+--@src/devices/machine/i7110.h,MACHINES["I7110"] = true
+---------------------------------------------------
+
+if (MACHINES["I7110"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/i7110.cpp",
+ MAME_DIR .. "src/devices/machine/i7110.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/machine/i7220.h,MACHINES["I7220"] = true
---------------------------------------------------
@@ -2252,6 +2264,18 @@ end
---------------------------------------------------
--
+--@src/devices/machine/gmboard.h,MACHINES["MB_GMBOARD"] = true
+---------------------------------------------------
+
+if MACHINES["MB_GMBOARD"] then
+ files {
+ MAME_DIR .. "src/devices/machine/gmboard.cpp",
+ MAME_DIR .. "src/devices/machine/gmboard.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/machine/mb14241.h,MACHINES["MB14241"] = true
---------------------------------------------------
diff --git a/scripts/src/mame/frontend.lua b/scripts/src/mame/frontend.lua
index 73e6c438cfb..51d61d9da9c 100644
--- a/scripts/src/mame/frontend.lua
+++ b/scripts/src/mame/frontend.lua
@@ -51,12 +51,6 @@ if (_OPTIONS["targetos"] == "windows") then
}
end
-if (_OPTIONS["osd"] == "sdl") then
- defines {
- "UI_SDL",
- }
-end
-
files {
MAME_DIR .. "src/frontend/mame/audit.cpp",
MAME_DIR .. "src/frontend/mame/audit.h",
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index fddf73b4046..b7fe831439b 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -154,12 +154,6 @@ 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",
@@ -364,6 +358,11 @@ function qtdebuggerbuild()
buildoptions {
"-Wno-error=inconsistent-missing-override",
}
+ if _OPTIONS["targetos"]=="windows" then
+ buildoptions {
+ "-Wno-ignored-attributes",
+ }
+ end
configuration { }
end
@@ -407,7 +406,19 @@ function qtdebuggerbuild()
local MOC = ""
if (os.is("windows")) then
- MOC = "moc"
+ local qt_host_libexecs
+ if _OPTIONS["QT_HOME"]~=nil then
+ qt_host_libexecs = backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_HOST_LIBEXECS")
+ else
+ qt_host_libexecs = backtick("qmake6 -query QT_HOST_LIBEXECS")
+ end
+ local MOCTST = backtick(qt_host_libexecs .. "/moc --version")
+ if MOCTST=='' then
+ print("Qt's Meta Object Compiler (moc) wasn't found!")
+ os.exit(1)
+ else
+ MOC = qt_host_libexecs .. "/moc"
+ end
else
if _OPTIONS["QT_HOME"]~=nil then
local MOCTST = backtick(_OPTIONS["QT_HOME"] .. "/bin/moc --version 2>/dev/null")
@@ -427,15 +438,14 @@ function qtdebuggerbuild()
MOC = _OPTIONS["QT_HOME"] .. "/bin/moc"
end
else
- local MOCTST = backtick("which moc-qt5 2>/dev/null")
- if MOCTST=='' then
- MOCTST = backtick("which moc 2>/dev/null")
- end
+ local qt_host_libexecs = backtick("qmake6 -query QT_HOST_LIBEXECS")
+ MOCTST = backtick(qt_host_libexecs .. "/moc --version 2>/dev/null")
if MOCTST=='' then
print("Qt's Meta Object Compiler (moc) wasn't found!")
os.exit(1)
+ else
+ MOC = qt_host_libexecs .. "/moc"
end
- MOC = MOCTST
end
end
@@ -456,7 +466,7 @@ function qtdebuggerbuild()
if _OPTIONS["targetos"]=="windows" then
configuration { "mingw*" }
buildoptions {
- "-I$(shell qmake -query QT_INSTALL_HEADERS)",
+ "-I$(shell qmake6 -query QT_INSTALL_HEADERS)",
}
configuration { }
elseif _OPTIONS["targetos"]=="macosx" then
@@ -470,7 +480,7 @@ function qtdebuggerbuild()
}
else
buildoptions {
- backtick(pkgconfigcmd() .. " --cflags Qt5Widgets"),
+ "-I$(shell qmake6 -query QT_INSTALL_HEADERS)",
}
end
end
@@ -518,55 +528,37 @@ function osdmodulestargetconf()
if _OPTIONS["USE_QTDEBUG"]=="1" then
if _OPTIONS["targetos"]=="windows" then
linkoptions {
- "-L$(shell qmake -query QT_INSTALL_LIBS)",
+ "-L$(shell qmake6 -query QT_INSTALL_LIBS)",
}
links {
- "Qt5Core.dll",
- "Qt5Gui.dll",
- "Qt5Widgets.dll",
+ "Qt6Core.dll",
+ "Qt6Gui.dll",
+ "Qt6Widgets.dll",
}
elseif _OPTIONS["targetos"]=="macosx" then
- local qt_version = str_to_version(backtick("qmake -query QT_VERSION"))
linkoptions {
"-F" .. backtick("qmake -query QT_INSTALL_LIBS"),
}
- if qt_version < 60000 then
- links {
- "Qt5Core.framework",
- "Qt5Gui.framework",
- "Qt5Widgets.framework",
- }
- else
- links {
- "QtCore.framework",
- "QtGui.framework",
- "QtWidgets.framework",
- }
- end
+ links {
+ "QtCore.framework",
+ "QtGui.framework",
+ "QtWidgets.framework",
+ }
else
if _OPTIONS["QT_HOME"]~=nil then
- local qt_version = str_to_version(backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_VERSION"))
linkoptions {
"-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_LIBS"),
}
- if qt_version < 60000 then
- links {
- "Qt5Core",
- "Qt5Gui",
- "Qt5Widgets",
- }
- else
- links {
- "Qt6Core",
- "Qt6Gui",
- "Qt6Widgets",
- }
- end
else
- local str = backtick(pkgconfigcmd() .. " --libs Qt5Widgets")
- addlibfromstring(str)
- addoptionsfromstring(str)
+ linkoptions {
+ "-L$(shell qmake6 -query QT_INSTALL_LIBS)",
+ }
end
+ links {
+ "Qt6Core",
+ "Qt6Gui",
+ "Qt6Widgets",
+ }
end
end
@@ -718,15 +710,6 @@ if not _OPTIONS["NO_USE_PIPEWIRE"] then
end
newoption {
- trigger = "MODERN_WIN_API",
- description = "Use Modern Windows APIs",
- allowed = {
- { "0", "Use classic Windows APIs - allows support for XP and later" },
- { "1", "Use Modern Windows APIs - support for Windows 8.1 and later" },
- },
-}
-
-newoption {
trigger = "USE_QTDEBUG",
description = "Use QT debugger",
allowed = {
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 814bb32eea3..a53b7fe858f 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -59,6 +59,8 @@ function maintargetosdoptions(_target,_subtarget)
links {
"SDL2main",
"SDL2",
+ "imm32",
+ "version",
}
configuration { "vs*" }
links {
diff --git a/scripts/src/osd/sdl3.lua b/scripts/src/osd/sdl3.lua
index b68ee0c2771..7446f6e475e 100644
--- a/scripts/src/osd/sdl3.lua
+++ b/scripts/src/osd/sdl3.lua
@@ -83,7 +83,13 @@ function maintargetosdoptions(_target,_subtarget)
links {
"dinput8",
+ "gdi32",
+ "imm32",
+ "ole32",
"psapi",
+ "setupapi",
+ "uuid",
+ "version",
}
elseif _OPTIONS["targetos"]=="haiku" then
links {
diff --git a/scripts/src/osd/sdl3_cfg.lua b/scripts/src/osd/sdl3_cfg.lua
index b0195355d7c..7eace8f65f6 100644
--- a/scripts/src/osd/sdl3_cfg.lua
+++ b/scripts/src/osd/sdl3_cfg.lua
@@ -133,7 +133,7 @@ elseif _OPTIONS["targetos"]=="linux" then
}
else
buildoptions {
- backtick(pkgconfigcmd() .. " --cflags Qt5Widgets"),
+ "-I$(shell qmake6 -query QT_INSTALL_HEADERS)",
}
end
elseif _OPTIONS["targetos"]=="macosx" then
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index 400a559862e..9efd4944cf2 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -142,7 +142,7 @@ elseif _OPTIONS["targetos"]=="linux" then
}
else
buildoptions {
- backtick(pkgconfigcmd() .. " --cflags Qt5Widgets"),
+ "-I$(shell qmake6 -query QT_INSTALL_HEADERS)",
}
end
elseif _OPTIONS["targetos"]=="macosx" then
diff --git a/scripts/src/osd/windows_cfg.lua b/scripts/src/osd/windows_cfg.lua
index 2eb8bae410a..0e4d2014f32 100644
--- a/scripts/src/osd/windows_cfg.lua
+++ b/scripts/src/osd/windows_cfg.lua
@@ -16,23 +16,10 @@ configuration { "vs*" }
configuration { }
-if not _OPTIONS["MODERN_WIN_API"] then
- _OPTIONS["MODERN_WIN_API"] = "0"
-end
-
-if _OPTIONS["MODERN_WIN_API"]=="1" then
- defines {
- "WINVER=0x0602",
- "_WIN32_WINNT=0x0602",
- "NTDDI_VERSION=0x06030000",
- "MODERN_WIN_API",
- }
-else
defines {
- "_WIN32_WINNT=0x0602",
- "NTDDI_VERSION=0x06000000",
+ "WINVER=0x0A00",
+ "_WIN32_WINNT=0x0A00",
}
-end
if _OPTIONS["USE_TAPTUN"]=="1" or _OPTIONS["USE_PCAP"]=="1" then
defines {
diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua
index 95283d41ba7..8d9f8fdd832 100644
--- a/scripts/src/sound.lua
+++ b/scripts/src/sound.lua
@@ -220,6 +220,18 @@ if SOUNDS["CEM3320"] then
end
---------------------------------------------------
+-- CEM 3340 voltage-controlled oscillator chip
+--@src/devices/sound/cem3340.h,SOUNDS["CEM3340"] = true
+---------------------------------------------------
+
+if SOUNDS["CEM3340"] then
+ files {
+ MAME_DIR .. "src/devices/sound/cem3340.cpp",
+ MAME_DIR .. "src/devices/sound/cem3340.h",
+ }
+end
+
+---------------------------------------------------
-- CEM 3360 dual voltage-controlled amplifier chip
--@src/devices/sound/cem3320.h,SOUNDS["CEM3360"] = true
---------------------------------------------------
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index d4d31e3cb94..33695f26de6 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -730,48 +730,6 @@ configuration { }
strip()
--------------------------------------------------
--- aueffectutil
---------------------------------------------------
-
-if _OPTIONS["targetos"] == "macosx" then
- project("aueffectutil")
- uuid ("3db8316d-fad7-4f5b-b46a-99373c91550e")
- kind "ConsoleApp"
-
- flags {
- "Symbols", -- always include minimum symbols for executables
- }
-
- if _OPTIONS["SEPARATE_BIN"]~="1" then
- targetdir(MAME_DIR)
- end
-
- linkoptions {
- "-sectcreate __TEXT __info_plist " .. _MAKE.esc(MAME_DIR) .. "src/tools/aueffectutil-Info.plist",
- }
-
- dependency {
- { "aueffectutil", MAME_DIR .. "src/tools/aueffectutil-Info.plist", true },
- }
-
- links {
- "AudioUnit.framework",
- "AudioToolbox.framework",
- "CoreAudio.framework",
- "CoreAudioKit.framework",
- "CoreServices.framework",
- }
-
- files {
- MAME_DIR .. "src/tools/aueffectutil.mm",
- }
-
- configuration { }
-
- strip()
-end
-
---------------------------------------------------
-- testkeys
--------------------------------------------------
@@ -816,6 +774,13 @@ if (_OPTIONS["osd"] == "sdl") or (_OPTIONS["osd"] == "sdl3") then
end
links {
libsdl,
+ "gdi32",
+ "imm32",
+ "ole32",
+ "oleaut32",
+ "setupapi",
+ "uuid",
+ "version",
}
configuration { "vs*" }
links {