summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/src/3rdparty.lua8
-rw-r--r--scripts/src/cpu.lua25
-rw-r--r--scripts/src/main.lua2
3 files changed, 18 insertions, 17 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index ad7932afdc2..b08e847a9ae 100755
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -29,14 +29,14 @@ project "expat"
"HAVE_STDLIB_H",
"HAVE_STRING_H",
"PACKAGE=\"expat\"",
- "PACKAGE_BUGREPORT=\"expat-bugs@libexpat.org\"",
+ "PACKAGE_BUGREPORT=\"https://github.com/libexpat/libexpat/issues\"",
"PACKAGE_NAME=\"expat\"",
- "PACKAGE_STRING=\"expat-2.2.10\"",
+ "PACKAGE_STRING=\"expat-2.7.1\"",
"PACKAGE_TARNAME=\"expat\"",
"PACKAGE_URL=\"\"",
- "PACKAGE_VERSION=\"2.2.10\"",
+ "PACKAGE_VERSION=\"2.7.1\"",
"STDC_HEADERS",
- "VERSION=\"2.2.10\"",
+ "VERSION=\"2.7.1\"",
"XML_CONTEXT_BYTES=1024",
"XML_DTD",
"XML_GE=1",
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 65ebc2eacdb..cb130e07527 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -21,9 +21,10 @@ for i, v in ipairs(DRC_CPUS) do
break
end
end
+CPU_INCLUDE_DRC_NATIVE = CPU_INCLUDE_DRC and (not _OPTIONS["FORCE_DRC_C_BACKEND"]) and ((_OPTIONS["PLATFORM"] == "x86") or (_OPTIONS["PLATFORM"] == "arm64"))
-if (CPU_INCLUDE_DRC) then
+if CPU_INCLUDE_DRC then
files {
MAME_DIR .. "src/devices/cpu/drcbec.cpp",
MAME_DIR .. "src/devices/cpu/drcbec.h",
@@ -41,16 +42,16 @@ if (CPU_INCLUDE_DRC) then
MAME_DIR .. "src/devices/cpu/x86log.h",
MAME_DIR .. "src/devices/cpu/drcumlsh.h",
}
- if (not _OPTIONS["FORCE_DRC_C_BACKEND"]) and ((_OPTIONS["PLATFORM"] == "x86") or (_OPTIONS["PLATFORM"] == "arm64")) then
- files {
- MAME_DIR .. "src/devices/cpu/drcbearm64.cpp",
- 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
+end
+if CPU_INCLUDE_DRC_NATIVE then
+ files {
+ MAME_DIR .. "src/devices/cpu/drcbearm64.cpp",
+ 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
--------------------------------------------------
@@ -1295,7 +1296,7 @@ end
-- Beware that opt_tool can set the value, so we want both to be executed always
local want_disasm_i86 = opt_tool(CPUS, "I86")
local want_disasm_i386 = opt_tool(CPUS, "I386")
-if want_disasm_i86 or want_disasm_i386 or CPU_INCLUDE_DRC then
+if want_disasm_i86 or want_disasm_i386 or CPU_INCLUDE_DRC_NATIVE then
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i386/i386dasm.cpp")
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i386/i386dasm.h")
end
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index d5f94bb60bd..7b1971d0da1 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -151,7 +151,7 @@ end
ext_lib("jpeg"),
"7z",
}
-if not _OPTIONS["FORCE_DRC_C_BACKEND"] then
+if CPU_INCLUDE_DRC_NATIVE then
links {
"asmjit",
}