summaryrefslogtreecommitdiffstats
path: root/docs/release/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'docs/release/scripts')
-rw-r--r--docs/release/scripts/build/complay.py28
-rw-r--r--docs/release/scripts/genie.lua164
-rw-r--r--docs/release/scripts/src/3rdparty.lua114
-rw-r--r--docs/release/scripts/src/bus.lua90
-rw-r--r--docs/release/scripts/src/cpu.lua2
-rw-r--r--docs/release/scripts/src/lib.lua2
-rw-r--r--docs/release/scripts/src/machine.lua49
-rw-r--r--docs/release/scripts/src/main.lua61
-rw-r--r--docs/release/scripts/src/mame/frontend.lua4
-rw-r--r--docs/release/scripts/src/osd/modules.lua7
-rw-r--r--docs/release/scripts/src/osd/sdl.lua6
-rw-r--r--docs/release/scripts/src/osd/windows.lua1
-rw-r--r--docs/release/scripts/src/osd/winui.lua2
-rw-r--r--docs/release/scripts/src/tests.lua4
-rw-r--r--docs/release/scripts/target/mame/arcade.lua6
-rw-r--r--docs/release/scripts/target/mame/mess.lua18
-rw-r--r--docs/release/scripts/toolchain.lua439
17 files changed, 232 insertions, 765 deletions
diff --git a/docs/release/scripts/build/complay.py b/docs/release/scripts/build/complay.py
index 81516bc3ee7..996908ecde0 100644
--- a/docs/release/scripts/build/complay.py
+++ b/docs/release/scripts/build/complay.py
@@ -253,7 +253,7 @@ class LayoutChecker(Minifyer):
if self.checkIntAttribute('orientation', attrs, 'rotate', 0) not in self.ORIENTATIONS:
self.handleError('Element orientation attribute rotate "%s" is unsupported' % (attrs['rotate'], ))
for name in ('swapxy', 'flipx', 'flipy'):
- if (attrs.get(name, 'no') not in self.YESNO) and (not self.VARPATTERN.match(attrs['yesno'])):
+ if (attrs.get(name, 'no') not in self.YESNO) and (not self.VARPATTERN.match(attrs[name])):
self.handleError('Element orientation attribute %s "%s" is not "yes" or "no"' % (name, attrs[name]))
def checkColor(self, attrs):
@@ -332,6 +332,8 @@ class LayoutChecker(Minifyer):
self.have_bounds.append(None if 'group' == name else { })
self.have_orientation.append(False)
self.have_color.append(None if 'group' == name else { })
+ self.have_xscroll.append(None if ('group' == name) or ('screen' == name) else False)
+ self.have_yscroll.append(None if ('group' == name) or ('screen' == name) else False)
def rootStartHandler(self, name, attrs):
if 'mamelayout' != name:
@@ -665,6 +667,24 @@ class LayoutChecker(Minifyer):
else:
self.handleError('Duplicate element color (previous %s)' % (self.have_color[-1], ))
self.checkColor(attrs)
+ elif ('xscroll' == name) or ('yscroll' == name):
+ have_scroll = self.have_xscroll if 'xscroll' == name else self.have_yscroll
+ if have_scroll[-1] is None:
+ self.handleError('Encountered unexpected element %s' % (name, ))
+ elif have_scroll[-1]:
+ self.handleError('Duplicate element %s' % (name, ))
+ else:
+ have_scroll[-1] = self.formatLocation()
+ self.checkFloatAttribute(name, attrs, 'size', 1.0)
+ if (attrs.get('wrap', 'no') not in self.YESNO) and (not self.VARPATTERN.match(attrs['wrap'])):
+ self.handleError('Element %s attribute wrap "%s" is not "yes" or "no"' % (name, attrs['wrap']))
+ if 'inputtag' in attrs:
+ if 'name' in attrs:
+ self.handleError('Element %s has both attribute inputtag and attribute name' % (name, ))
+ self.checkTag(attrs['inputtag'], name, 'inputtag')
+ self.checkIntAttribute(name, attrs, 'mask', None)
+ self.checkIntAttribute(name, attrs, 'min', None)
+ self.checkIntAttribute(name, attrs, 'max', None)
else:
self.handleError('Encountered unexpected element %s' % (name, ))
self.ignored_depth = 1
@@ -673,6 +693,8 @@ class LayoutChecker(Minifyer):
self.have_bounds.pop()
self.have_orientation.pop()
self.have_color.pop()
+ self.have_xscroll.pop()
+ self.have_yscroll.pop()
self.handlers.pop()
def setDocumentLocator(self, locator):
@@ -688,6 +710,8 @@ class LayoutChecker(Minifyer):
self.have_bounds = [ ]
self.have_orientation = [ ]
self.have_color = [ ]
+ self.have_xscroll = [ ]
+ self.have_yscroll = [ ]
self.generated_element_names = False
self.generated_group_names = False
super(LayoutChecker, self).startDocument()
@@ -709,6 +733,8 @@ class LayoutChecker(Minifyer):
del self.have_bounds
del self.have_orientation
del self.have_color
+ del self.have_xscroll
+ del self.have_yscroll
del self.generated_element_names
del self.generated_group_names
super(LayoutChecker, self).endDocument()
diff --git a/docs/release/scripts/genie.lua b/docs/release/scripts/genie.lua
index 2d53bda770b..b2d3d475533 100644
--- a/docs/release/scripts/genie.lua
+++ b/docs/release/scripts/genie.lua
@@ -14,8 +14,6 @@ newoption {
premake.check_paths = true
premake.make.override = { "TARGET" }
-premake.xcode.parameters = { 'CLANG_CXX_LANGUAGE_STANDARD = "c++17"', 'CLANG_CXX_LIBRARY = "libc++"' }
-
MAME_DIR = (path.getabsolute("..") .. "/")
--MAME_DIR = string.gsub(MAME_DIR, "(%s)", "\\%1")
local MAME_BUILD_DIR = (MAME_DIR .. _OPTIONS["build-dir"] .. "/")
@@ -74,8 +72,7 @@ end
function precompiledheaders()
if _OPTIONS["precompile"]==nil or (_OPTIONS["precompile"]~=nil and _OPTIONS["precompile"]=="1") then
- configuration { "not xcode4" }
- pchheader("emu.h")
+ pchheader("emu.h")
configuration { }
end
end
@@ -144,16 +141,11 @@ newoption {
{ "freebsd", "FreeBSD" },
{ "netbsd", "NetBSD" },
{ "openbsd", "OpenBSD" },
- { "pnacl", "Native Client - PNaCl" },
{ "linux", "Linux" },
- { "ios", "iOS" },
{ "macosx", "OSX" },
{ "windows", "Windows" },
{ "haiku", "Haiku" },
{ "solaris", "Solaris SunOS" },
- { "steamlink", "Steam Link" },
- { "rpi", "Raspberry Pi" },
- { "ci20", "Creator-Ci20" },
},
}
@@ -474,17 +466,11 @@ configurations {
"Release",
}
-if _ACTION == "xcode4" then
- platforms {
- "x64",
- }
-else
- platforms {
- "x32",
- "x64",
- "Native", -- for targets where bitness is not specified
- }
-end
+platforms {
+ "x32",
+ "x64",
+ "Native", -- for targets where bitness is not specified
+}
language "C++"
@@ -528,35 +514,7 @@ configuration { "Release", "vs20*" }
}
end
-configuration { "vsllvm" }
- buildoptions {
- "/bigobj",
- }
- flags {
- "NoPCH",
- "ExtraWarnings",
- }
- if not _OPTIONS["NOWERROR"] then
- flags{
- "FatalWarnings",
- }
- end
-
-
-configuration { "Debug", "vsllvm" }
- flags {
- "Symbols",
- "NoMultiProcessorCompilation",
- }
-
-configuration { "Release", "vsllvm" }
- flags {
- "Optimize",
- "NoEditAndContinue",
- "NoIncrementalLink",
- }
-
--- Force VS2015/17 targets to use bundled SDL2
+-- Force Visual Studio targets to use bundled SDL2
if string.sub(_ACTION,1,4) == "vs20" and _OPTIONS["osd"]=="sdl" then
if _OPTIONS["with-bundled-sdl2"]==nil then
_OPTIONS["with-bundled-sdl2"] = "1"
@@ -785,11 +743,9 @@ local version = str_to_version(_OPTIONS["gcc_version"])
"-std=c++17",
}
-- this speeds it up a bit by piping between the preprocessor/compiler/assembler
- if not ("pnacl" == _OPTIONS["gcc"]) then
- buildoptions {
- "-pipe",
- }
- end
+ buildoptions {
+ "-pipe",
+ }
-- add -g if we need symbols, and ensure we have frame pointers
if _OPTIONS["SYMBOLS"]~=nil and _OPTIONS["SYMBOLS"]~="0" then
buildoptions {
@@ -1075,7 +1031,7 @@ end
local version = str_to_version(_OPTIONS["gcc_version"])
- if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "pnacl") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android") then
+ if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android") then
if (version < 60000) then
print("Clang version 6.0 or later needed")
os.exit(-1)
@@ -1228,17 +1184,7 @@ configuration { "android-arm64" }
"-Wno-asm-operand-widths",
}
-configuration { "pnacl" }
- buildoptions {
- "-std=gnu89",
- "-Wno-inline-new-delete",
- }
- buildoptions_cpp {
- "-std=c++17",
- }
- archivesplit_size "20"
-
-configuration { "linux-* or rpi or ci20"}
+configuration { "linux-*"}
links {
"dl",
"rt",
@@ -1252,42 +1198,7 @@ configuration { "linux-* or rpi or ci20"}
-configuration { "steamlink" }
- links {
- "dl",
- "EGL",
- "GLESv2",
- "SDL2",
- }
- defines {
- "EGL_API_FB",
- }
-
-configuration { "rpi" }
- links {
- "SDL2",
- "fontconfig",
- "X11",
- "GLESv2",
- "EGL",
- "bcm_host",
- "vcos",
- "vchiq_arm",
- "pthread",
- }
-
-
-configuration { "ci20" }
- links {
- "SDL2",
- "asound",
- "fontconfig",
- "freetype",
- "pthread",
- }
-
-
-configuration { "osx* or xcode4" }
+configuration { "osx*" }
links {
"pthread",
}
@@ -1318,19 +1229,6 @@ configuration { "mingw*" }
"userenv",
}
-configuration { "vsllvm" }
- defines {
- "XML_STATIC",
- "WIN32",
- "_WIN32",
- "_CRT_NONSTDC_NO_DEPRECATE",
- "_CRT_SECURE_NO_DEPRECATE",
- "_CRT_STDIO_LEGACY_WIDE_SPECIFIERS",
- }
- includedirs {
- MAME_DIR .. "3rdparty/dxsdk/Include"
- }
-
configuration { "vs20*" }
defines {
"XML_STATIC",
@@ -1341,8 +1239,6 @@ configuration { "vs20*" }
"_CRT_STDIO_LEGACY_WIDE_SPECIFIERS",
}
--- Windows Store/Phone projects already link against the available libraries.
-if _OPTIONS["vs"]==nil or not (string.startswith(_OPTIONS["vs"], "winstore8") or string.startswith(_OPTIONS["vs"], "winphone8")) then
links {
"user32",
"winmm",
@@ -1355,7 +1251,6 @@ if _OPTIONS["vs"]==nil or not (string.startswith(_OPTIONS["vs"], "winstore8") or
"shell32",
"userenv",
}
-end
buildoptions {
"/WX", -- Treats all compiler warnings as errors.
@@ -1461,39 +1356,6 @@ end
includedirs {
MAME_DIR .. "3rdparty/dxsdk/Include"
}
-configuration { "winphone8* or winstore8*" }
- linkoptions {
- "/ignore:4264" -- LNK4264: archiving object file compiled with /ZW into a static library; note that when authoring Windows Runtime types it is not recommended to link with a static library that contains Windows Runtime metadata
- }
-configuration { "vsllvm" }
- buildoptions {
- "-Wno-tautological-constant-out-of-range-compare",
- "-Wno-ignored-qualifiers",
- "-Wno-missing-field-initializers",
- "-Wno-ignored-pragma-optimize",
- "-Wno-unknown-warning-option",
- "-Wno-unused-function",
- "-Wno-unused-label",
- "-Wno-unused-local-typedef",
- "-Wno-unused-const-variable",
- "-Wno-unused-parameter",
- "-Wno-unneeded-internal-declaration",
- "-Wno-unused-private-field",
- "-Wno-missing-braces",
- "-Wno-unused-variable",
- "-Wno-tautological-pointer-compare",
- "-Wno-nonportable-include-path",
- "-Wno-enum-conversion",
- "-Wno-pragma-pack",
- "-Wno-new-returns-null",
- "-Wno-sign-compare",
- "-Wno-switch",
- "-Wno-tautological-undefined-compare",
- "-Wno-deprecated-declarations",
- "-Wno-macro-redefined",
- "-Wno-narrowing",
- }
-
configuration { }
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 {
diff --git a/docs/release/scripts/target/mame/arcade.lua b/docs/release/scripts/target/mame/arcade.lua
index f339007eeb0..e7e1520d51a 100644
--- a/docs/release/scripts/target/mame/arcade.lua
+++ b/docs/release/scripts/target/mame/arcade.lua
@@ -3038,6 +3038,7 @@ files {
MAME_DIR .. "src/mame/drivers/rallyx.cpp",
MAME_DIR .. "src/mame/includes/rallyx.h",
MAME_DIR .. "src/mame/video/rallyx.cpp",
+ MAME_DIR .. "src/mame/drivers/rbowlorama.cpp",
MAME_DIR .. "src/mame/drivers/shootaway2.cpp",
MAME_DIR .. "src/mame/drivers/skykid.cpp",
MAME_DIR .. "src/mame/includes/skykid.h",
@@ -4163,7 +4164,6 @@ files {
MAME_DIR .. "src/mame/includes/taito_l.h",
MAME_DIR .. "src/mame/video/taito_l.cpp",
MAME_DIR .. "src/mame/drivers/taito_x.cpp",
- MAME_DIR .. "src/mame/includes/taito_x.h",
MAME_DIR .. "src/mame/machine/taitocchip.cpp",
MAME_DIR .. "src/mame/machine/taitocchip.h",
MAME_DIR .. "src/mame/drivers/taito_z.cpp",
@@ -4886,6 +4886,7 @@ files {
MAME_DIR .. "src/mame/drivers/dgpix.cpp",
MAME_DIR .. "src/mame/drivers/diamondking.cpp",
MAME_DIR .. "src/mame/drivers/discoboy.cpp",
+ MAME_DIR .. "src/mame/drivers/dmainevent.cpp",
MAME_DIR .. "src/mame/drivers/dominob.cpp",
MAME_DIR .. "src/mame/drivers/dorachan.cpp",
MAME_DIR .. "src/mame/drivers/drdmania.cpp",
@@ -4961,6 +4962,7 @@ files {
MAME_DIR .. "src/mame/video/homedata.cpp",
MAME_DIR .. "src/mame/drivers/hotblock.cpp",
MAME_DIR .. "src/mame/drivers/hotstuff.cpp",
+ MAME_DIR .. "src/mame/drivers/houseball.cpp",
MAME_DIR .. "src/mame/drivers/ichiban.cpp",
MAME_DIR .. "src/mame/drivers/imolagp.cpp",
MAME_DIR .. "src/mame/drivers/intrscti.cpp",
@@ -5083,6 +5085,7 @@ files {
MAME_DIR .. "src/mame/drivers/quizo.cpp",
MAME_DIR .. "src/mame/drivers/quizpun2.cpp",
MAME_DIR .. "src/mame/drivers/radikaldarts.cpp",
+ MAME_DIR .. "src/mame/drivers/rawthrillspc.cpp",
MAME_DIR .. "src/mame/drivers/rbmk.cpp",
MAME_DIR .. "src/mame/drivers/rcorsair.cpp",
MAME_DIR .. "src/mame/drivers/re900.cpp",
@@ -5123,6 +5126,7 @@ files {
MAME_DIR .. "src/mame/drivers/sstrangr.cpp",
MAME_DIR .. "src/mame/drivers/startouch.cpp",
MAME_DIR .. "src/mame/drivers/statriv2.cpp",
+ MAME_DIR .. "src/mame/drivers/stop.cpp",
MAME_DIR .. "src/mame/drivers/strkzn.cpp",
MAME_DIR .. "src/mame/drivers/stuntair.cpp",
MAME_DIR .. "src/mame/drivers/su2000.cpp",
diff --git a/docs/release/scripts/target/mame/mess.lua b/docs/release/scripts/target/mame/mess.lua
index 580e9460a3f..450208e490d 100644
--- a/docs/release/scripts/target/mame/mess.lua
+++ b/docs/release/scripts/target/mame/mess.lua
@@ -304,7 +304,7 @@ SOUNDS["VRC6"] = true
--SOUNDS["AC97"] = true
--SOUNDS["ES1373"] = true
SOUNDS["L7A1045"] = true
---SOUNDS["AD1848"] = true
+SOUNDS["AD1848"] = true
SOUNDS["UPD1771"] = true
SOUNDS["GB_SOUND"] = true
SOUNDS["PCD3311"] = true
@@ -460,7 +460,9 @@ MACHINES["68681"] = true
MACHINES["7200FIFO"] = true
MACHINES["8530SCC"] = true
MACHINES["ACIA6850"] = true
+MACHINES["ACORN_BMU"] = true
MACHINES["ACORN_IOC"] = true
+MACHINES["ACORN_LC"] = true
MACHINES["ACORN_MEMC"] = true
MACHINES["ACORN_VIDC"] = true
MACHINES["ADC0804"] = true
@@ -730,6 +732,8 @@ MACHINES["TTL74543"] = true
MACHINES["TTL7474"] = true
MACHINES["TUBE"] = true
MACHINES["UCB1200"] = true
+MACHINES["UPC82C710"] = true
+MACHINES["UPC82C711"] = true
MACHINES["UPD1990A"] = true
MACHINES["UPD4991A"] = true
--MACHINES["UPD4992"] = true
@@ -844,6 +848,8 @@ BUSES["APRICOT_KEYBOARD"] = true
BUSES["APRICOT_VIDEO"] = true
BUSES["AQUARIUS"] = true
BUSES["ARCADIA"] = true
+BUSES["ARCHIMEDES_ECONET"] = true
+BUSES["ARCHIMEDES_PODULE"] = true
BUSES["ASTROCADE"] = true
BUSES["ATA"] = true
BUSES["BBC_1MHZBUS"] = true
@@ -1360,6 +1366,7 @@ function linkProjects_mame_mess(_target, _subtarget)
"pitronic",
"poly",
"poly88",
+ "positron",
"psion",
"quantel",
"qume",
@@ -2025,6 +2032,7 @@ files {
MAME_DIR .. "src/mame/drivers/fp6000.cpp",
MAME_DIR .. "src/mame/machine/fp6000_kbd.cpp",
MAME_DIR .. "src/mame/machine/fp6000_kbd.h",
+ MAME_DIR .. "src/mame/drivers/ctk2000.cpp",
MAME_DIR .. "src/mame/drivers/ctk551.cpp",
MAME_DIR .. "src/mame/drivers/ht6000.cpp",
MAME_DIR .. "src/mame/drivers/pb1000.cpp",
@@ -2438,6 +2446,7 @@ files {
MAME_DIR .. "src/mame/audio/channelf.cpp",
MAME_DIR .. "src/mame/audio/channelf.h",
MAME_DIR .. "src/mame/video/channelf.cpp",
+ MAME_DIR .. "src/mame/drivers/f387x.cpp",
}
createMESSProjects(_target, _subtarget, "fairlight")
@@ -3046,6 +3055,7 @@ files {
MAME_DIR .. "src/mame/drivers/mekd5.cpp",
MAME_DIR .. "src/mame/drivers/mvme147.cpp",
MAME_DIR .. "src/mame/drivers/mvme162.cpp",
+ MAME_DIR .. "src/mame/drivers/sys1121.cpp",
MAME_DIR .. "src/mame/drivers/uchroma68.cpp",
}
@@ -3392,6 +3402,11 @@ files {
MAME_DIR .. "src/mame/machine/poly88.cpp",
}
+createMESSProjects(_target, _subtarget, "positron")
+files {
+ MAME_DIR .. "src/mame/drivers/positron.cpp",
+}
+
createMESSProjects(_target, _subtarget, "psion")
files {
MAME_DIR .. "src/mame/drivers/psion.cpp",
@@ -3505,6 +3520,7 @@ files {
MAME_DIR .. "src/mame/drivers/roland_tr505.cpp",
MAME_DIR .. "src/mame/drivers/roland_tr606.cpp",
MAME_DIR .. "src/mame/drivers/roland_tr707.cpp",
+ MAME_DIR .. "src/mame/drivers/roland_tr808.cpp",
MAME_DIR .. "src/mame/drivers/roland_tr909.cpp",
MAME_DIR .. "src/mame/drivers/roland_u20.cpp",
MAME_DIR .. "src/mame/audio/bu3905.cpp",
diff --git a/docs/release/scripts/toolchain.lua b/docs/release/scripts/toolchain.lua
index 5fc886e1f48..4a3eac02546 100644
--- a/docs/release/scripts/toolchain.lua
+++ b/docs/release/scripts/toolchain.lua
@@ -17,8 +17,6 @@ newoption {
allowed = {
{ "android-arm", "Android - ARM" },
{ "android-arm64", "Android - ARM64" },
- { "android-mips", "Android - MIPS" },
- { "android-mips64","Android - MIPS64" },
{ "android-x86", "Android - x86" },
{ "android-x64", "Android - x64" },
{ "asmjs", "Emscripten/asm.js" },
@@ -26,8 +24,6 @@ newoption {
{ "freebsd-clang", "FreeBSD (clang compiler)"},
{ "linux-gcc", "Linux (GCC compiler)" },
{ "linux-clang", "Linux (Clang compiler)" },
- { "ios-arm", "iOS - ARM" },
- { "ios-simulator", "iOS - Simulator" },
{ "mingw32-gcc", "MinGW32" },
{ "mingw64-gcc", "MinGW64" },
{ "mingw-clang", "MinGW (clang compiler)" },
@@ -36,11 +32,7 @@ newoption {
{ "openbsd", "OpenBSD" },
{ "osx", "OSX (GCC compiler)" },
{ "osx-clang", "OSX (Clang compiler)" },
- { "pnacl", "Native Client - PNaCl" },
- { "rpi", "RaspberryPi" },
{ "solaris", "Solaris" },
- { "steamlink", "Steam Link" },
- { "ci20", "Creator-Ci20" },
},
}
@@ -49,48 +41,17 @@ newoption {
value = "toolset",
description = "Choose VS toolset",
allowed = {
- { "intel-14", "Intel C++ Compiler XE 14.0" },
{ "intel-15", "Intel C++ Compiler XE 15.0" },
- { "vs2015-clang", "Clang 3.6" },
- { "vs2015-xp", "Visual Studio 2015 targeting XP" },
- { "vs2017-clang", "Clang 3.6" },
- { "vs2017-xp", "Visual Studio 2017 targeting XP" },
{ "clangcl", "Visual Studio 2019 using Clang/LLVM" },
- { "winphone8", "Windows Phone 8.0" },
- { "winphone81", "Windows Phone 8.1" },
- { "winstore81", "Windows Store 8.1" },
- { "winstore82", "Universal Windows App" }
},
}
newoption {
- trigger = "xcode",
- value = "xcode_target",
- description = "Choose XCode target",
- allowed = {
- { "osx", "OSX" },
- { "ios", "iOS" },
- }
-}
-
-newoption {
trigger = "with-android",
value = "#",
description = "Set Android platform version (default: android-21).",
}
-newoption {
- trigger = "with-ios",
- value = "#",
- description = "Set iOS target version (default: 8.0).",
-}
-
-newoption {
- trigger = "with-windows",
- value = "#",
- description = "Set the Windows target platform version (default: 10.0.10240.0).",
-}
-
function toolchain(_buildDir, _subDir)
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION)
@@ -102,16 +63,6 @@ function toolchain(_buildDir, _subDir)
androidPlatform = "android-24"
end
- local iosPlatform = ""
- if _OPTIONS["with-ios"] then
- iosPlatform = _OPTIONS["with-ios"]
- end
-
- local windowsPlatform = "10.0.10240.0"
- if _OPTIONS["with-windows"] then
- windowsPlatform = _OPTIONS["with-windows"]
- end
-
if _ACTION == "gmake" or _ACTION == "ninja" then
if nil == _OPTIONS["gcc"] or nil == _OPTIONS["gcc_version"] then
@@ -138,8 +89,6 @@ function toolchain(_buildDir, _subDir)
local platformToolchainMap = {
['arm'] = "arm-linux-androideabi",
['arm64'] = "aarch64-linux-android",
- ['mips64'] = "mips64el-linux-android",
- ['mips'] = "mipsel-linux-android",
['x86'] = "i686-linux-android",
['x64'] = "x86_64-linux-android",
}
@@ -187,20 +136,6 @@ function toolchain(_buildDir, _subDir)
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-openbsd")
end
- if "ios-arm" == _OPTIONS["gcc"] then
- premake.gcc.cc = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
- premake.gcc.cxx = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++"
- premake.gcc.ar = "ar"
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-ios-arm")
- end
-
- if "ios-simulator" == _OPTIONS["gcc"] then
- premake.gcc.cc = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
- premake.gcc.cxx = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++"
- premake.gcc.ar = "ar"
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-ios-simulator")
- end
-
if "linux-gcc" == _OPTIONS["gcc"] then
-- Force gcc-4.2 on ubuntu-intrepid
if _OPTIONS["distro"]=="ubuntu-intrepid" then
@@ -223,36 +158,6 @@ function toolchain(_buildDir, _subDir)
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-linux-clang")
end
- if "steamlink" == _OPTIONS["gcc"] then
- if not os.getenv("MARVELL_SDK_PATH") then
- print("Set MARVELL_SDK_PATH envrionment variable.")
- end
- premake.gcc.cc = "$(MARVELL_SDK_PATH)/toolchain/bin/armv7a-cros-linux-gnueabi-gcc"
- premake.gcc.cxx = "$(MARVELL_SDK_PATH)/toolchain/bin/armv7a-cros-linux-gnueabi-g++"
- premake.gcc.ar = "$(MARVELL_SDK_PATH)/toolchain/bin/armv7a-cros-linux-gnueabi-ar"
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-steamlink")
- end
-
- if "rpi" == _OPTIONS["gcc"] then
- if not os.getenv("RASPBERRY_SDK_PATH") then
- print("Set RASPBERRY_SDK_PATH envrionment variable.")
- end
- premake.gcc.cc = "$(RASPBERRY_SDK_PATH)/bin/arm-linux-gnueabihf-gcc"
- premake.gcc.cxx = "$(RASPBERRY_SDK_PATH)/bin/arm-linux-gnueabihf-g++"
- premake.gcc.ar = "$(RASPBERRY_SDK_PATH)/bin/arm-linux-gnueabihf-ar"
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-rpi")
- end
-
- if "ci20" == _OPTIONS["gcc"] then
- if not os.getenv("MIPS_LINUXGNU_ROOT") then
- print("Set MIPS_LINUXGNU_ROOT envrionment variable.")
- end
- premake.gcc.cc = "$(MIPS_LINUXGNU_ROOT)/bin/mips-mti-linux-gnu-gcc"
- premake.gcc.cxx = "$(MIPS_LINUXGNU_ROOT)/bin/mips-mti-linux-gnu-g++"
- premake.gcc.ar = "$(MIPS_LINUXGNU_ROOT)/bin/mips-mti-linux-gnu-ar"
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-ci20")
- end
-
if "mingw32-gcc" == _OPTIONS["gcc"] then
if not os.getenv("MINGW32") then
print("Set MINGW32 envrionment variable.")
@@ -302,181 +207,17 @@ function toolchain(_buildDir, _subDir)
premake.gcc.ar = toolchainPrefix .. "ar"
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-osx-clang")
end
-
- if "pnacl" == _OPTIONS["gcc"] then
-
- if not os.getenv("NACL_SDK_ROOT") then
- print("Set NACL_SDK_ROOT enviroment variables.")
- end
-
- naclToolchain = "$(NACL_SDK_ROOT)/toolchain/win_pnacl/bin/pnacl-"
- if os.is("macosx") then
- naclToolchain = "$(NACL_SDK_ROOT)/toolchain/mac_pnacl/bin/pnacl-"
- elseif os.is("linux") then
- naclToolchain = "$(NACL_SDK_ROOT)/toolchain/linux_pnacl/bin/pnacl-"
- end
-
- premake.gcc.cc = naclToolchain .. "clang"
- premake.gcc.cxx = naclToolchain .. "clang++"
- premake.gcc.ar = naclToolchain .. "ar"
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-pnacl")
- end
-
- if "rpi" == _OPTIONS["gcc"] then
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-rpi")
- end
-
- if "ci20" == _OPTIONS["gcc"] then
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-ci20")
- end
- elseif _ACTION == "vs2015" or _ACTION == "vs2015-fastbuild" then
-
- if (_ACTION .. "-clang") == _OPTIONS["vs"] then
- premake.vstudio.toolset = ("LLVM-" .. _ACTION)
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-clang")
- end
-
- if "winphone8" == _OPTIONS["vs"] then
- premake.vstudio.toolset = "v110_wp80"
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winphone8")
- end
-
- if "winphone81" == _OPTIONS["vs"] then
- premake.vstudio.toolset = "v120_wp81"
- platforms { "ARM" }
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winphone81")
- end
-
- if "winstore81" == _OPTIONS["vs"] then
- premake.vstudio.toolset = "v120"
- premake.vstudio.storeapp = "8.1"
- platforms { "ARM" }
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winstore81")
- end
-
- if "winstore82" == _OPTIONS["vs"] then
- premake.vstudio.toolset = "v140"
- premake.vstudio.storeapp = "8.2"
-
- -- If needed, depending on GENie version, enable file-level configuration
- if enablefilelevelconfig ~= nil then
- enablefilelevelconfig()
- end
-
- local action = premake.action.current()
- action.vstudio.windowsTargetPlatformVersion = windowsPlatform
-
- platforms { "ARM" }
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winstore82")
- end
-
- if "intel-14" == _OPTIONS["vs"] then
- premake.vstudio.toolset = "Intel C++ Compiler XE 14.0"
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-intel")
- end
-
- if "intel-15" == _OPTIONS["vs"] then
- premake.vstudio.toolset = "Intel C++ Compiler XE 15.0"
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-intel")
- end
-
- if ("vs2015-xp") == _OPTIONS["vs"] then
- premake.vstudio.toolset = ("v140_xp")
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp")
- end
- elseif _ACTION == "vs2017" or _ACTION == "vs2017-fastbuild" then
-
- if (_ACTION .. "-clang") == _OPTIONS["vs"] then
- premake.vstudio.toolset = ("LLVM-" .. _ACTION)
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-clang")
- end
-
- if "winphone8" == _OPTIONS["vs"] then
- premake.vstudio.toolset = "v110_wp80"
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winphone8")
- end
-
- if "winphone81" == _OPTIONS["vs"] then
- premake.vstudio.toolset = "v120_wp81"
- platforms { "ARM" }
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winphone81")
- end
-
- if "winstore81" == _OPTIONS["vs"] then
- premake.vstudio.toolset = "v120"
- premake.vstudio.storeapp = "8.1"
- platforms { "ARM" }
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winstore81")
- end
-
- if "winstore82" == _OPTIONS["vs"] then
- premake.vstudio.toolset = "v141"
- premake.vstudio.storeapp = "8.2"
-
- -- If needed, depending on GENie version, enable file-level configuration
- if enablefilelevelconfig ~= nil then
- enablefilelevelconfig()
- end
-
- local action = premake.action.current()
- action.vstudio.windowsTargetPlatformVersion = windowsPlatform
-
- platforms { "ARM" }
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winstore82")
- end
-
- if "intel-14" == _OPTIONS["vs"] then
- premake.vstudio.toolset = "Intel C++ Compiler XE 14.0"
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-intel")
- end
-
- if "intel-15" == _OPTIONS["vs"] then
- premake.vstudio.toolset = "Intel C++ Compiler XE 15.0"
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-intel")
- end
-
- if ("vs2017-xp") == _OPTIONS["vs"] then
- premake.vstudio.toolset = ("v141_xp")
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp")
- end
- elseif _ACTION == "vs2019" or _ACTION == "vs2019-fastbuild" then
+ elseif _ACTION == "vs2019" then
if "clangcl" == _OPTIONS["vs"] then
premake.vstudio.toolset = ("ClangCL")
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-clang")
end
- if "winstore82" == _OPTIONS["vs"] then
- premake.vstudio.toolset = "v142"
- premake.vstudio.storeapp = "10.0"
-
- -- If needed, depending on GENie version, enable file-level configuration
- if enablefilelevelconfig ~= nil then
- enablefilelevelconfig()
- end
-
- local action = premake.action.current()
- action.vstudio.windowsTargetPlatformVersion = windowsPlatform
-
- platforms { "ARM" }
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winstore82")
- end
-
if "intel-15" == _OPTIONS["vs"] then
premake.vstudio.toolset = "Intel C++ Compiler XE 15.0"
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-intel")
end
- elseif _ACTION == "xcode4" then
-
-
- if "osx" == _OPTIONS["xcode"] then
- premake.xcode.toolset = "macosx"
- location (path.join(_buildDir, "projects", _ACTION .. "-osx"))
-
- elseif "ios" == _OPTIONS["xcode"] then
- premake.xcode.toolset = "iphoneos"
- location (path.join(_buildDir, "projects", _ACTION .. "-ios"))
- end
end
if (_OPTIONS["CC"] ~= nil) then
@@ -514,16 +255,6 @@ function toolchain(_buildDir, _subDir)
configuration { "x64", "vs*", "Debug" }
targetdir (_buildDir .. _ACTION .. "/bin/x64/Debug")
- configuration { "ARM", "vs*" }
- targetdir (_buildDir .. _ACTION .. "/bin/ARM")
- objdir (_buildDir .. _ACTION .. "/obj")
-
- configuration { "ARM", "vs*", "Release" }
- targetdir (_buildDir .. _ACTION .. "/bin/ARM/Release")
-
- configuration { "ARM", "vs*", "Debug" }
- targetdir (_buildDir .. _ACTION .. "/bin/ARM/Debug")
-
configuration { "x32", "vs*-clang" }
objdir (_buildDir .. _ACTION .. "-clang/obj")
@@ -547,15 +278,6 @@ function toolchain(_buildDir, _subDir)
"-Qunused-arguments",
}
- configuration { "winphone8* or winstore8*" }
- removeflags {
- "StaticRuntime",
- "NoExceptions",
- }
- flags {
- "WinMain"
- }
-
configuration { "mingw*" }
defines { "WIN32" }
@@ -579,115 +301,6 @@ function toolchain(_buildDir, _subDir)
configuration { "x64", "mingw64-gcc", "Debug" }
targetdir (_buildDir .. "mingw-gcc" .. "/bin/x64/Debug")
- configuration { "steamlink" }
- objdir ( _buildDir .. "steamlink/obj")
- defines {
- "__STEAMLINK__=1", -- There is no special prefedined compiler symbol to detect SteamLink, faking it.
- }
- buildoptions {
- "-marm",
- "-mfloat-abi=hard",
- "--sysroot=$(MARVELL_SDK_PATH)/rootfs",
- }
- linkoptions {
- "-static-libgcc",
- "-static-libstdc++",
- "--sysroot=$(MARVELL_SDK_PATH)/rootfs",
- }
-
- configuration { "steamlink", "Release" }
- targetdir (_buildDir .. "steamlink/bin/Release")
-
- configuration { "steamlink", "Debug" }
- targetdir (_buildDir .. "steamlink/bin/Debug")
-
- configuration { "rpi" }
- objdir ( _buildDir .. "rpi/obj")
- libdirs {
- "$(RASPBERRY_SYSROOT)/opt/vc/lib",
- }
- includedirs {
- "$(RASPBERRY_SYSROOT)/opt/vc/include",
- "$(RASPBERRY_SYSROOT)/opt/vc/include/interface/vcos/pthreads",
- "$(RASPBERRY_SYSROOT)/opt/vc/include/interface/vmcs_host/linux",
- }
- defines {
- "__VCCOREVER__=0x04000000", -- There is no special prefedined compiler symbol to detect RaspberryPi, faking it.
- }
- linkoptions {
- "-Wl,--gc-sections",
- }
- buildoptions {
- "--sysroot=$(RASPBERRY_SYSROOT)",
- }
- linkoptions {
- "-static-libgcc",
- "-static-libstdc++",
- "--sysroot=$(RASPBERRY_SYSROOT)",
- }
-
- configuration { "rpi", "Release" }
- targetdir (_buildDir .. "rpi/bin/Release")
-
- configuration { "rpi", "Debug" }
- targetdir (_buildDir .. "rpi/bin/Debug")
-
- configuration { "ci20" }
- objdir ( _buildDir .. "ci20/obj")
- includedirs {
- "$(CI20_SYSROOT)/mipsel-r2-hard/usr/include/c++/4.9",
- "$(CI20_SYSROOT)/mipsel-r2-hard/usr/include/mipsel-linux-gnu/c++/4.9",
- "$(CI20_SYSROOT)/mipsel-r2-hard/usr/include/c++/4.9/backward",
- "$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib/gcc/mipsel-linux-gnu/4.9/include",
- "$(CI20_SYSROOT)/mipsel-r2-hard/usr/local/include",
- "$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib/gcc/mipsel-linux-gnu/4.9/include-fixed",
- "$(CI20_SYSROOT)/mipsel-r2-hard/usr/include/mipsel-linux-gnu",
- "$(CI20_SYSROOT)/mipsel-r2-hard/usr/include",
- }
- links {
- "c",
- "dl",
- "m",
- "gcc",
- "stdc++",
- "gcc_s",
- }
-
- buildoptions {
- "--sysroot=$(CI20_SYSROOT)",
- "-Wno-pragmas",
- "-Wno-undef",
- "-EL",
- "-mel",
- "-march=mips32r2",
- "-mllsc",
- "-mabi=32",
- }
- linkoptions {
- "--sysroot=$(CI20_SYSROOT)",
- "-Wl,-rpath=$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib/mipsel-linux-gnu/",
- "-Wl,-rpath=$(CI20_SYSROOT)/mipsel-r2-hard/lib/mipsel-linux-gnu/",
- "-nostdlib",
- "-EL",
- "-mel",
- "-march=mips32r2",
- "-mllsc",
- "-mabi=32",
- "$(MIPS_LINUXGNU_ROOT)/lib/gcc/mips-mti-linux-gnu/4.9.2/mipsel-r2-hard/lib/crtbegin.o",
- "$(MIPS_LINUXGNU_ROOT)/lib/gcc/mips-mti-linux-gnu/4.9.2/mipsel-r2-hard/lib/crtend.o",
- "-L$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib/gcc/mipsel-linux-gnu/4.9",
- "-L$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib/mipsel-linux-gnu",
- "-L$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib",
- "-L$(CI20_SYSROOT)/mipsel-r2-hard/lib/mipsel-linux-gnu",
- "-L$(CI20_SYSROOT)/mipsel-r2-hard/lib",
- }
-
- configuration { "ci20", "Release" }
- targetdir (_buildDir .. "ci20/bin/Release")
-
- configuration { "ci20", "Debug" }
- targetdir (_buildDir .. "ci20/bin/Debug")
-
configuration { "mingw-clang" }
buildoptions {
"-femulated-tls",
@@ -1021,36 +634,6 @@ function toolchain(_buildDir, _subDir)
"-Wno-extern-c-compat",
}
- configuration { "pnacl" }
- buildoptions {
- "-U__STRICT_ANSI__", -- strcasecmp, setenv, unsetenv,...
- "-fno-stack-protector",
- "-fdiagnostics-show-option",
- "-fdata-sections",
- "-ffunction-sections",
- "-Wunused-value",
- }
-
- configuration { "pnacl" }
- buildoptions {
- "-Wno-tautological-undefined-compare",
- "-Wno-cast-align",
- }
- includedirs {
- "$(NACL_SDK_ROOT)/include",
- "$(NACL_SDK_ROOT)/include/pnacl",
- }
-
- configuration { "pnacl" }
- targetdir (_buildDir .. "pnacl" .. "/bin")
- objdir (_buildDir .. "pnacl" .. "/obj")
-
- configuration { "pnacl", "Debug" }
- libdirs { "$(NACL_SDK_ROOT)/lib/pnacl/Debug" }
-
- configuration { "pnacl", "Release" }
- libdirs { "$(NACL_SDK_ROOT)/lib/pnacl/Release" }
-
configuration { "osx*", "x32", "not arm64" }
objdir (_buildDir .. "osx_clang" .. "/obj")
buildoptions {
@@ -1086,18 +669,6 @@ function toolchain(_buildDir, _subDir)
configuration { "osx*", "arm64", "Debug" }
targetdir (_buildDir .. "osx_clang" .. "/bin/x64/Debug")
- configuration { "ios-arm" }
- targetdir (_buildDir .. "ios-arm" .. "/bin")
- objdir (_buildDir .. "ios-arm" .. "/obj")
-
- configuration { "ios-simulator" }
- targetdir (_buildDir .. "ios-simulator" .. "/bin")
- objdir (_buildDir .. "ios-simulator" .. "/obj")
-
- configuration { "rpi" }
- targetdir (_buildDir .. "rpi" .. "/bin")
- objdir (_buildDir .. "rpi" .. "/obj")
-
configuration {} -- reset configuration
return true
@@ -1120,7 +691,7 @@ function strip()
"$(SILENT) " .. toolchainPrefix .. "strip -s \"$(TARGET)\""
}
- configuration { "linux-* or rpi" }
+ configuration { "linux-*" }
postbuildcommands {
"$(SILENT) echo Stripping symbols.",
"$(SILENT) strip -s \"$(TARGET)\""
@@ -1137,12 +708,6 @@ function strip()
"$(SILENT) " .. (_OPTIONS['TOOLCHAIN'] or "$(MINGW32)/bin/") .. "strip -s \"$(TARGET)\"",
}
- configuration { "pnacl" }
- postbuildcommands {
- "$(SILENT) echo Running pnacl-finalize.",
- "$(SILENT) " .. naclToolchain .. "finalize \"$(TARGET)\""
- }
-
configuration { "asmjs" }
postbuildcommands {
"$(SILENT) echo Running asmjs finalize.",