summaryrefslogtreecommitdiffstats
path: root/docs/release/scripts
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2016-06-29 20:24:44 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2016-06-29 20:24:44 +1000
commitd464963202d6fac34b687f232a42a1d3353630c2 (patch)
treee4281c2e2b2832b005ca866db5f901f28e507139 /docs/release/scripts
parentafef8430619718d39dd7906a9342fe3bd06b6225 (diff)
0.175 Release fileshbmame175
Diffstat (limited to 'docs/release/scripts')
-rw-r--r--docs/release/scripts/extlib.lua6
-rw-r--r--docs/release/scripts/genie.lua18
-rw-r--r--docs/release/scripts/src/3rdparty.lua410
-rw-r--r--docs/release/scripts/src/bus.lua48
-rw-r--r--docs/release/scripts/src/cpu.lua25
-rw-r--r--docs/release/scripts/src/emu.lua1
-rw-r--r--docs/release/scripts/src/lib.lua3
-rw-r--r--docs/release/scripts/src/machine.lua36
-rw-r--r--docs/release/scripts/src/main.lua28
-rw-r--r--docs/release/scripts/src/mame/frontend.lua2
-rw-r--r--docs/release/scripts/src/netlist.lua14
-rw-r--r--docs/release/scripts/src/osd/modules.lua4
-rw-r--r--docs/release/scripts/src/osd/newui.lua3
-rw-r--r--docs/release/scripts/src/osd/sdl.lua15
-rw-r--r--docs/release/scripts/src/osd/windows.lua36
-rw-r--r--docs/release/scripts/src/osd/winui.lua3
-rw-r--r--docs/release/scripts/src/tests.lua4
-rw-r--r--docs/release/scripts/src/tools.lua5
-rw-r--r--docs/release/scripts/src/video.lua12
-rw-r--r--docs/release/scripts/target/mame/arcade.lua22
-rw-r--r--docs/release/scripts/target/mame/mess.lua18
-rw-r--r--docs/release/scripts/target/mame/tiny.lua1
-rw-r--r--docs/release/scripts/toolchain.lua131
23 files changed, 433 insertions, 412 deletions
diff --git a/docs/release/scripts/extlib.lua b/docs/release/scripts/extlib.lua
index 9d60fe1dc2e..e4e3b7cce46 100644
--- a/docs/release/scripts/extlib.lua
+++ b/docs/release/scripts/extlib.lua
@@ -10,7 +10,6 @@ local extlibs = {
zlib = { "z", "3rdparty/zlib" },
jpeg = { "jpeg", "3rdparty/libjpeg" },
flac = { "FLAC", "3rdparty/libflac/include" },
- sqlite3 = { "sqlite3", "3rdparty/sqlite3" },
portmidi = { "portmidi", "3rdparty/portmidi/pm_common" },
portaudio = { "portaudio", "3rdparty/portaudio/include" },
lua = { "lua", "3rdparty/lua/src" },
@@ -39,11 +38,6 @@ newoption {
}
newoption {
- trigger = 'with-system-sqlite3',
- description = 'Use system SQLite library',
-}
-
-newoption {
trigger = 'with-system-portmidi',
description = 'Use system PortMidi library',
}
diff --git a/docs/release/scripts/genie.lua b/docs/release/scripts/genie.lua
index cfb30ed95d8..903d77ce3ed 100644
--- a/docs/release/scripts/genie.lua
+++ b/docs/release/scripts/genie.lua
@@ -350,15 +350,6 @@ newoption {
}
newoption {
- trigger = "IGNORE_GIT",
- description = "Ignore usage of git command in build process",
- allowed = {
- { "0", "Do not ignore" },
- { "1", "Ingore" },
- },
-}
-
-newoption {
trigger = "SOURCES",
description = "List of sources to compile.",
}
@@ -521,7 +512,7 @@ if (_OPTIONS["SOURCES"] == nil) then
dofile (path.join("target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua"))
end
-configuration { "gmake" }
+configuration { "gmake or ninja" }
flags {
"SingleOutputDir",
}
@@ -681,7 +672,7 @@ end
"LUA_COMPAT_5_2",
}
- if _ACTION == "gmake" then
+ if _ACTION == "gmake" or _ACTION == "ninja" then
--we compile C-only to C99 standard with GNU extensions
@@ -714,7 +705,7 @@ end
-- this speeds it up a bit by piping between the preprocessor/compiler/assembler
if not ("pnacl" == _OPTIONS["gcc"]) then
buildoptions {
- "--pipe",
+ "-pipe",
}
end
-- add -g if we need symbols, and ensure we have frame pointers
@@ -1119,6 +1110,7 @@ configuration { "mingw*" }
"-static-libgcc",
"-static-libstdc++",
"-static",
+ "-Wl,--start-group",
}
links {
"user32",
@@ -1265,7 +1257,7 @@ end
includedirs {
MAME_DIR .. "3rdparty/dxsdk/Include"
}
-configuration { "vs2015" }
+configuration { "vs2015*" }
buildoptions {
"/wd4334", -- warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
diff --git a/docs/release/scripts/src/3rdparty.lua b/docs/release/scripts/src/3rdparty.lua
index 664898d114e..d8e6c9e2fff 100644
--- a/docs/release/scripts/src/3rdparty.lua
+++ b/docs/release/scripts/src/3rdparty.lua
@@ -60,7 +60,7 @@ if _OPTIONS["vs"]=="intel-15" then
"/Qwd869", -- remark #869: parameter "xxx" was never referenced
}
end
- configuration { "vs2015" }
+ configuration { "vs2015*" }
buildoptions {
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
}
@@ -88,7 +88,7 @@ project "zlib"
local version = str_to_version(_OPTIONS["gcc_version"])
if _OPTIONS["gcc"]~=nil and ((string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android"))) then
- configuration { "gmake" }
+ configuration { "gmake or ninja" }
if (version >= 30700) then
buildoptions {
"-Wno-shift-negative-value",
@@ -113,7 +113,7 @@ end
"verbose=-1",
}
- configuration { "gmake" }
+ configuration { "gmake or ninja" }
buildoptions_c {
"-Wno-strict-prototypes",
}
@@ -284,7 +284,7 @@ end
"-include stdint.h"
}
- configuration { "vs2015" }
+ configuration { "vs2015*" }
buildoptions {
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
}
@@ -299,7 +299,7 @@ end
"HAVE_CONFIG_H=1",
}
- configuration { "gmake" }
+ configuration { "gmake or ninja" }
buildoptions_c {
"-Wno-unused-function",
"-O0",
@@ -352,7 +352,7 @@ project "7z"
uuid "ad573d62-e76a-4b11-ae34-5110a6789a42"
kind "StaticLib"
- configuration { "gmake" }
+ configuration { "gmake or ninja" }
buildoptions_c {
"-Wno-undef",
"-Wno-strict-prototypes",
@@ -372,7 +372,7 @@ if _OPTIONS["vs"]=="intel-15" then
"/Qwd869", -- remark #869: parameter "xxx" was never referenced
}
end
- configuration { "vs2015" }
+ configuration { "vs2015*" }
buildoptions {
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
"/wd4457", -- warning C4457: declaration of 'xxx' hides function parameter
@@ -439,14 +439,14 @@ project "lua"
-- uncomment the options below to
-- compile using c++. Do the same
- -- in lsqlite3.
+ -- in lualibs.
-- In addition comment out the "extern "C""
-- in lua.hpp and do the same in luaengine.c line 47
--options {
-- "ForceCPP",
--}
- configuration { "gmake" }
+ configuration { "gmake or ninja" }
buildoptions_c {
"-Wno-bad-function-cast"
}
@@ -558,75 +558,14 @@ project "lualibs"
includedirs {
ext_includedir("lua"),
ext_includedir("zlib"),
- ext_includedir("sqlite3"),
}
files {
- MAME_DIR .. "3rdparty/lsqlite3/lsqlite3.c",
MAME_DIR .. "3rdparty/lua-zlib/lua_zlib.c",
MAME_DIR .. "3rdparty/luafilesystem/src/lfs.c",
}
--------------------------------------------------
--- SQLite3 library objects
---------------------------------------------------
-
-if not _OPTIONS["with-system-sqlite3"] then
-project "sqlite3"
- uuid "5cb3d495-57ed-461c-81e5-80dc0857517d"
- kind "StaticLib"
-
- configuration { "vs*" }
- buildoptions {
- "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
- "/wd4127", -- warning C4127: conditional expression is constant
- "/wd4232", -- warning C4232: nonstandard extension used : 'xxx' : address of dllimport 'xxx' is not static, identity not guaranteed
- "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter
- "/wd4706", -- warning C4706: assignment within conditional expression
- }
-if _OPTIONS["vs"]=="intel-15" then
- buildoptions {
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
- "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
- }
-end
- configuration { "pnacl" }
- defines {
- "SQLITE_OMIT_LOAD_EXTENSION",
- }
- configuration { "vs2015" }
- buildoptions {
- "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
- }
-
-
- configuration { "gmake" }
- buildoptions_c {
- "-Wno-bad-function-cast",
- "-Wno-undef",
- }
-
- local version = str_to_version(_OPTIONS["gcc_version"])
- if _OPTIONS["gcc"]~=nil and not string.find(_OPTIONS["gcc"], "clang") then
- if (version >= 40800) then
- buildoptions_c {
- "-Wno-array-bounds",
- }
- end
- end
-
- configuration { }
-
- files {
- MAME_DIR .. "3rdparty/sqlite3/sqlite3.c",
- }
-else
-links {
- ext_lib("sqlite3"),
-}
-end
-
---------------------------------------------------
-- portmidi library objects
--------------------------------------------------
if _OPTIONS["NO_USE_MIDI"]~="1" then
@@ -656,7 +595,7 @@ if _OPTIONS["vs"]=="intel-15" then
}
end
- configuration { "vs2015" }
+ configuration { "vs2015*" }
buildoptions {
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
}
@@ -778,7 +717,7 @@ end
MAME_DIR .. "3rdparty/bx/include/compat/freebsd",
}
- configuration { "gmake" }
+ configuration { "gmake or ninja" }
buildoptions {
"-Wno-uninitialized",
"-Wno-unused-function",
@@ -811,6 +750,8 @@ end
if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then
buildoptions {
"-Wno-switch",
+ }
+ buildoptions_cpp {
"-Wno-unknown-pragmas",
}
end
@@ -854,15 +795,12 @@ end
MAME_DIR .. "3rdparty/bgfx/examples/common/font/utf8.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/imgui.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/ocornut_imgui.cpp",
- MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/scintilla.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg_bgfx.cpp",
MAME_DIR .. "3rdparty/bgfx/3rdparty/ib-compress/indexbuffercompression.cpp",
MAME_DIR .. "3rdparty/bgfx/3rdparty/ib-compress/indexbufferdecompression.cpp",
MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui.cpp",
- MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_demo.cpp",
MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_draw.cpp",
- MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_node_graph_test.cpp",
MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_wm.cpp",
}
if _OPTIONS["targetos"]=="macosx" then
@@ -876,155 +814,155 @@ end
--------------------------------------------------
-- PortAudio library objects
--------------------------------------------------
-
-if not _OPTIONS["with-system-portaudio"] then
-project "portaudio"
- uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4"
- kind "StaticLib"
-
- configuration { "vs*" }
- buildoptions {
- "/wd4245", -- warning C4245: 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch
- "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
- "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter
- "/wd4389", -- warning C4389: 'operator' : signed/unsigned mismatch
- "/wd4189", -- warning C4189: 'xxx' : local variable is initialized but not referenced
- "/wd4127", -- warning C4127: conditional expression is constant
- }
-if _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
- }
-end
- configuration { "vs2015" }
- buildoptions {
- "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
- }
-
- configuration { "gmake" }
- buildoptions_c {
- "-Wno-strict-prototypes",
- "-Wno-bad-function-cast",
- "-Wno-undef",
- "-Wno-missing-braces",
- "-Wno-unused-variable",
- "-Wno-unused-value",
- "-Wno-unused-function",
- "-Wno-unknown-pragmas",
- }
-
- local version = str_to_version(_OPTIONS["gcc_version"])
- if (_OPTIONS["gcc"]~=nil) then
- if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then
- buildoptions_c {
- "-Wno-unknown-warning-option",
- "-Wno-absolute-value",
- "-Wno-unused-but-set-variable",
- "-Wno-maybe-uninitialized",
- "-Wno-sometimes-uninitialized",
- }
- else
- if (version >= 40600) then
- buildoptions_c {
- "-Wno-unused-but-set-variable",
- "-Wno-maybe-uninitialized",
- "-Wno-sometimes-uninitialized",
- }
- end
- end
- end
- configuration { "vs*" }
- buildoptions {
- "/wd4204", -- warning C4204: nonstandard extension used : non-constant aggregate initializer
- "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used
- }
-
- configuration { }
-
- includedirs {
- MAME_DIR .. "3rdparty/portaudio/include",
- MAME_DIR .. "3rdparty/portaudio/src/common",
- }
-
- files {
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_allocation.c",
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_converters.c",
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_cpuload.c",
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_dither.c",
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_debugprint.c",
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_front.c",
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_process.c",
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_stream.c",
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_trace.c",
- MAME_DIR .. "3rdparty/portaudio/src/hostapi/skeleton/pa_hostapi_skeleton.c",
- }
-
- if _OPTIONS["targetos"]=="windows" then
- defines {
- "PA_USE_DS=1",
- "PA_USE_WDMKS=1",
- "PA_USE_WMME=1",
- }
- includedirs {
- MAME_DIR .. "3rdparty/portaudio/src/os/win",
- }
-
- configuration { }
- files {
- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_util.c",
- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_waveformat.c",
- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_hostapis.c",
- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_wdmks_utils.c",
- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_coinitialize.c",
- MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c",
- MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c",
- MAME_DIR .. "3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c",
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c",
- MAME_DIR .. "3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c",
- }
-
- end
- if _OPTIONS["targetos"]=="linux" then
- defines {
- "PA_USE_ALSA=1",
- "PA_USE_OSS=1",
- "HAVE_LINUX_SOUNDCARD_H",
- }
- includedirs {
- MAME_DIR .. "3rdparty/portaudio/src/os/unix",
- }
- files {
- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c",
- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c",
- MAME_DIR .. "3rdparty/portaudio/src/hostapi/alsa/pa_linux_alsa.c",
- MAME_DIR .. "3rdparty/portaudio/src/hostapi/oss/pa_unix_oss.c",
- }
- end
- if _OPTIONS["targetos"]=="macosx" then
- defines {
- "PA_USE_COREAUDIO=1",
- }
- includedirs {
- MAME_DIR .. "3rdparty/portaudio/src/os/unix",
- }
- files {
- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c",
- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c",
- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core.c",
- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c",
- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c",
- MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c",
- }
- end
-
-else
-links {
- ext_lib("portaudio"),
-}
-end
+--
+--if not _OPTIONS["with-system-portaudio"] then
+--project "portaudio"
+-- uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4"
+-- kind "StaticLib"
+--
+-- configuration { "vs*" }
+-- buildoptions {
+-- "/wd4245", -- warning C4245: 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch
+-- "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
+-- "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter
+-- "/wd4389", -- warning C4389: 'operator' : signed/unsigned mismatch
+-- "/wd4189", -- warning C4189: 'xxx' : local variable is initialized but not referenced
+-- "/wd4127", -- warning C4127: conditional expression is constant
+-- }
+--if _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
+-- }
+--end
+-- configuration { "vs2015*" }
+-- buildoptions {
+-- "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
+-- }
+--
+-- configuration { "gmake or ninja" }
+-- buildoptions_c {
+-- "-Wno-strict-prototypes",
+-- "-Wno-bad-function-cast",
+-- "-Wno-undef",
+-- "-Wno-missing-braces",
+-- "-Wno-unused-variable",
+-- "-Wno-unused-value",
+-- "-Wno-unused-function",
+-- "-Wno-unknown-pragmas",
+-- }
+--
+-- local version = str_to_version(_OPTIONS["gcc_version"])
+-- if (_OPTIONS["gcc"]~=nil) then
+-- if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then
+-- buildoptions_c {
+-- "-Wno-unknown-warning-option",
+-- "-Wno-absolute-value",
+-- "-Wno-unused-but-set-variable",
+-- "-Wno-maybe-uninitialized",
+-- "-Wno-sometimes-uninitialized",
+-- }
+-- else
+-- if (version >= 40600) then
+-- buildoptions_c {
+-- "-Wno-unused-but-set-variable",
+-- "-Wno-maybe-uninitialized",
+-- "-Wno-sometimes-uninitialized",
+-- }
+-- end
+-- end
+-- end
+-- configuration { "vs*" }
+-- buildoptions {
+-- "/wd4204", -- warning C4204: nonstandard extension used : non-constant aggregate initializer
+-- "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used
+-- }
+--
+-- configuration { }
+--
+-- includedirs {
+-- MAME_DIR .. "3rdparty/portaudio/include",
+-- MAME_DIR .. "3rdparty/portaudio/src/common",
+-- }
+--
+-- files {
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_allocation.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_converters.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_cpuload.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_dither.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_debugprint.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_front.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_process.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_stream.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_trace.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/skeleton/pa_hostapi_skeleton.c",
+-- }
+--
+-- if _OPTIONS["targetos"]=="windows" then
+-- defines {
+-- "PA_USE_DS=1",
+-- "PA_USE_WDMKS=1",
+-- "PA_USE_WMME=1",
+-- }
+-- includedirs {
+-- MAME_DIR .. "3rdparty/portaudio/src/os/win",
+-- }
+--
+-- configuration { }
+-- files {
+-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_util.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_waveformat.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_hostapis.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_wdmks_utils.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_coinitialize.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c",
+-- }
+--
+-- end
+-- if _OPTIONS["targetos"]=="linux" then
+-- defines {
+-- "PA_USE_ALSA=1",
+-- "PA_USE_OSS=1",
+-- "HAVE_LINUX_SOUNDCARD_H",
+-- }
+-- includedirs {
+-- MAME_DIR .. "3rdparty/portaudio/src/os/unix",
+-- }
+-- files {
+-- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/alsa/pa_linux_alsa.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/oss/pa_unix_oss.c",
+-- }
+-- end
+-- if _OPTIONS["targetos"]=="macosx" then
+-- defines {
+-- "PA_USE_COREAUDIO=1",
+-- }
+-- includedirs {
+-- MAME_DIR .. "3rdparty/portaudio/src/os/unix",
+-- }
+-- files {
+-- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c",
+-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c",
+-- }
+-- end
+--
+--else
+--links {
+-- ext_lib("portaudio"),
+--}
+--end
--------------------------------------------------
-- libuv library objects
@@ -1041,7 +979,7 @@ project "uv"
MAME_DIR .. "3rdparty/libuv/src/win",
}
- configuration { "gmake" }
+ configuration { "gmake or ninja" }
buildoptions_c {
"-Wno-strict-prototypes",
"-Wno-bad-function-cast",
@@ -1230,29 +1168,7 @@ project "uv"
}
end
end
---------------------------------------------------
--- HTTP parser library objects
---------------------------------------------------
-project "http-parser"
- uuid "90c6ba59-bdb2-4fee-8b44-57601d690e14"
- kind "StaticLib"
-
- configuration { }
-
- files {
- MAME_DIR .. "3rdparty/http-parser/http_parser.c",
- }
- if (_OPTIONS["SHADOW_CHECK"]=="1") then
- removebuildoptions {
- "-Wshadow"
- }
- end
-
-else
-links {
- ext_lib("uv"),
-}
end
--------------------------------------------------
-- SDL2 library
diff --git a/docs/release/scripts/src/bus.lua b/docs/release/scripts/src/bus.lua
index 3da1e88cb3c..5fdd355a955 100644
--- a/docs/release/scripts/src/bus.lua
+++ b/docs/release/scripts/src/bus.lua
@@ -576,6 +576,19 @@ end
---------------------------------------------------
--
+--@src/devices/bus/electron/exp.h,BUSES["ELECTRON"] = true
+---------------------------------------------------
+
+if (BUSES["ELECTRON"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/electron/exp.cpp",
+ MAME_DIR .. "src/devices/bus/electron/exp.h",
+ }
+end
+
+
+---------------------------------------------------
+--
--@src/devices/bus/ep64/exp.h,BUSES["EP64"] = true
---------------------------------------------------
@@ -1047,6 +1060,8 @@ if (BUSES["PET"]~=null) then
MAME_DIR .. "src/devices/bus/pet/petuja.h",
MAME_DIR .. "src/devices/bus/pet/cb2snd.cpp",
MAME_DIR .. "src/devices/bus/pet/cb2snd.h",
+ MAME_DIR .. "src/devices/bus/pet/2joysnd.h",
+ MAME_DIR .. "src/devices/bus/pet/2joysnd.cpp",
}
end
@@ -1077,6 +1092,23 @@ end
---------------------------------------------------
--
+--@src/devices/bus/pofo/exp.h,BUSES["POFO"] = true
+---------------------------------------------------
+
+if (BUSES["POFO"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/pofo/exp.cpp",
+ MAME_DIR .. "src/devices/bus/pofo/exp.h",
+ MAME_DIR .. "src/devices/bus/pofo/hpc101.cpp",
+ MAME_DIR .. "src/devices/bus/pofo/hpc101.h",
+ MAME_DIR .. "src/devices/bus/pofo/hpc102.cpp",
+ MAME_DIR .. "src/devices/bus/pofo/hpc102.h",
+ }
+end
+
+
+---------------------------------------------------
+--
--@src/devices/bus/s100/s100.h,BUSES["S100"] = true
---------------------------------------------------
@@ -2044,6 +2076,22 @@ end
---------------------------------------------------
--
+--@src/devices/bus/sg1000_exp/sg1000exp.h,BUSES["SG1000_EXP"] = true
+---------------------------------------------------
+
+if (BUSES["SG1000_EXP"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/sg1000_exp/sg1000exp.cpp",
+ MAME_DIR .. "src/devices/bus/sg1000_exp/sg1000exp.h",
+ MAME_DIR .. "src/devices/bus/sg1000_exp/sk1100.cpp",
+ MAME_DIR .. "src/devices/bus/sg1000_exp/sk1100.h",
+ MAME_DIR .. "src/devices/bus/sg1000_exp/fm_unit.cpp",
+ MAME_DIR .. "src/devices/bus/sg1000_exp/fm_unit.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/bus/sms_ctrl/smsctrl.h,BUSES["SMS_CTRL"] = true
---------------------------------------------------
diff --git a/docs/release/scripts/src/cpu.lua b/docs/release/scripts/src/cpu.lua
index bb630af1e5c..ef9263c6485 100644
--- a/docs/release/scripts/src/cpu.lua
+++ b/docs/release/scripts/src/cpu.lua
@@ -221,6 +221,9 @@ if (CPUS["ADSP21062"]~=null) then
MAME_DIR .. "src/devices/cpu/sharc/sharcmem.hxx",
MAME_DIR .. "src/devices/cpu/sharc/sharcops.h",
MAME_DIR .. "src/devices/cpu/sharc/sharcops.hxx",
+ MAME_DIR .. "src/devices/cpu/sharc/sharcdrc.cpp",
+ MAME_DIR .. "src/devices/cpu/sharc/sharcfe.cpp",
+ MAME_DIR .. "src/devices/cpu/sharc/sharcfe.h",
}
end
@@ -1446,13 +1449,13 @@ end
--------------------------------------------------
-- PATINHO FEIO - Escola Politecnica - USP (Brazil)
---@src/devices/cpu/patinhofeio/patinho_feio.h,CPUS["PATINHOFEIO"] = true
+--@src/devices/cpu/patinhofeio/patinhofeio_cpu.h,CPUS["PATINHOFEIO"] = true
--------------------------------------------------
if (CPUS["PATINHOFEIO"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.cpp",
- MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.h",
+ MAME_DIR .. "src/devices/cpu/patinhofeio/patinhofeio_cpu.h",
}
end
@@ -2367,3 +2370,21 @@ if (CPUS["ALTO2"]~=null or _OPTIONS["with-tools"]) then
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/alto2/alto2dsm.cpp")
end
+------------------------------------------
+-- Sun SPARC, Fujitus MB86901 implementation
+--@src/devices/cpu/sparc/sparc.h,CPUS["MB86901"] = true
+--------------------------------------------------
+
+if (CPUS["MB86901"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/cpu/sparc/mb86901.cpp",
+ MAME_DIR .. "src/devices/cpu/sparc/sparcv8ops.ipp",
+ MAME_DIR .. "src/devices/cpu/sparc/sparcdasm.h",
+ MAME_DIR .. "src/devices/cpu/sparc/sparcdefs.h",
+ MAME_DIR .. "src/devices/cpu/sparc/sparc.h",
+ }
+end
+
+if (CPUS["MB86901"]~=null or _OPTIONS["with-tools"]) then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sparc/sparcdasm.cpp")
+end
diff --git a/docs/release/scripts/src/emu.lua b/docs/release/scripts/src/emu.lua
index 2449faa0ae5..a446a6ccaae 100644
--- a/docs/release/scripts/src/emu.lua
+++ b/docs/release/scripts/src/emu.lua
@@ -33,6 +33,7 @@ includedirs {
ext_includedir("lua"),
ext_includedir("zlib"),
ext_includedir("flac"),
+ ext_includedir("jpeg"),
}
files {
diff --git a/docs/release/scripts/src/lib.lua b/docs/release/scripts/src/lib.lua
index aacd4da54d4..8c3536b144d 100644
--- a/docs/release/scripts/src/lib.lua
+++ b/docs/release/scripts/src/lib.lua
@@ -80,7 +80,8 @@ project "utils"
MAME_DIR .. "src/lib/util/sha1.cpp",
MAME_DIR .. "src/lib/util/sha1.h",
MAME_DIR .. "src/lib/util/strformat.h",
- MAME_DIR .. "src/lib/util/tagmap.h",
+ MAME_DIR .. "src/lib/util/timeconv.cpp",
+ MAME_DIR .. "src/lib/util/timeconv.h",
MAME_DIR .. "src/lib/util/unicode.cpp",
MAME_DIR .. "src/lib/util/unicode.h",
MAME_DIR .. "src/lib/util/unzip.cpp",
diff --git a/docs/release/scripts/src/machine.lua b/docs/release/scripts/src/machine.lua
index 61fba0708e9..aab2cb0b8e3 100644
--- a/docs/release/scripts/src/machine.lua
+++ b/docs/release/scripts/src/machine.lua
@@ -1178,6 +1178,18 @@ end
---------------------------------------------------
--
+--@src/devices/machine/ldp1000.h,MACHINES["LDP1000"] = true
+---------------------------------------------------
+
+if (MACHINES["LDP1000"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/ldp1000.cpp",
+ MAME_DIR .. "src/devices/machine/ldp1000.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/machine/ldvp931.h,MACHINES["LDVP931"] = true
---------------------------------------------------
@@ -2034,6 +2046,18 @@ end
---------------------------------------------------
--
+--@src/devices/machine/scnxx562.h,MACHINES["DUSCC"] = true
+---------------------------------------------------
+
+if (MACHINES["DUSCC"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/scnxx562.cpp",
+ MAME_DIR .. "src/devices/machine/scnxx562.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/machine/serflash.h,MACHINES["SERFLASH"] = true
---------------------------------------------------
@@ -2856,6 +2880,7 @@ if (MACHINES["APPLE_FDC"]~=null) then
MAME_DIR .. "src/devices/machine/applefdc.h",
}
end
+
---------------------------------------------------
--
--@src/devices/machine/sonydriv.h,MACHINES["SONY_DRIVE"] = true
@@ -2866,3 +2891,14 @@ if (MACHINES["SONY_DRIVE"]~=null) then
MAME_DIR .. "src/devices/machine/sonydriv.h",
}
end
+
+---------------------------------------------------
+--
+--@src/devices/machine/scnxx562.h,MACHINES["SCNXX562"] = true
+---------------------------------------------------
+if (MACHINES["SCNXX562"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/scnxx562.cpp",
+ MAME_DIR .. "src/devices/machine/scnxx562.h",
+ }
+end
diff --git a/docs/release/scripts/src/main.lua b/docs/release/scripts/src/main.lua
index 31b9090d6b1..8fc9965d3c7 100644
--- a/docs/release/scripts/src/main.lua
+++ b/docs/release/scripts/src/main.lua
@@ -115,7 +115,7 @@ end
targetextension ".bc"
if os.getenv("EMSCRIPTEN") then
local emccopts = ""
- .. " -O3"
+ .. " -O" .. _OPTIONS["OPTIMIZE"]
.. " -s USE_SDL=2"
.. " -s USE_SDL_TTF=2"
.. " --memory-init-file 0"
@@ -132,7 +132,9 @@ end
.. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "artwork/slot-mask.png@artwork/slot-mask.png"
if _OPTIONS["SYMBOLS"]~=nil and _OPTIONS["SYMBOLS"]~="0" then
- emccopts = emccopts .. " -g" .. _OPTIONS["SYMLEVEL"]
+ emccopts = emccopts
+ .. " -g" .. _OPTIONS["SYMLEVEL"]
+ .. " -s DEMANGLE_SUPPORT=1"
end
if _OPTIONS["ARCHOPTS"] then
@@ -145,17 +147,7 @@ end
end
configuration { }
-
-if _OPTIONS["IGNORE_GIT"]~="1" then
- GIT_VERSION = backtick( "git describe --dirty" )
- local p = string.find(GIT_VERSION, '-', 1)
- if (p~=nil) then
- defines {
- "GIT_VERSION=" .. string.sub(GIT_VERSION,p+1)
- }
- end
-end
-
+
if _OPTIONS["targetos"]=="android" then
includedirs {
MAME_DIR .. "3rdparty/SDL2/include",
@@ -229,13 +221,11 @@ end
if _OPTIONS["USE_LIBUV"]=="1" then
links {
ext_lib("uv"),
- "http-parser",
}
end
links {
ext_lib("zlib"),
ext_lib("flac"),
- ext_lib("sqlite3"),
}
if _OPTIONS["NO_USE_MIDI"]~="1" then
@@ -277,7 +267,7 @@ if (STANDALONE~=true) then
"-sectcreate __TEXT __info_plist " .. _MAKE.esc(GEN_DIR) .. "resource/" .. _subtarget .. "-Info.plist"
}
custombuildtask {
- { MAME_DIR .. "src/version.cpp" , GEN_DIR .. "resource/" .. _subtarget .. "-Info.plist", { MAME_DIR .. "scripts/build/verinfo.py" }, {"@echo Emitting " .. _subtarget .. "-Info.plist" .. "...", PYTHON .. " $(1) -p -b " .. _subtarget .. " $(<) > $(@)" }},
+ { GEN_DIR .. "version.cpp" , GEN_DIR .. "resource/" .. _subtarget .. "-Info.plist", { MAME_DIR .. "scripts/build/verinfo.py" }, {"@echo Emitting " .. _subtarget .. "-Info.plist" .. "...", PYTHON .. " $(1) -p -b " .. _subtarget .. " $(<) > $(@)" }},
}
dependency {
{ "$(TARGET)" , GEN_DIR .. "resource/" .. _subtarget .. "-Info.plist", true },
@@ -355,21 +345,21 @@ if (STANDALONE~=true) then
configuration { "mingw*" }
custombuildtask {
- { MAME_DIR .. "src/version.cpp" , GEN_DIR .. "resource/" .. rctarget .. "vers.rc", { MAME_DIR .. "scripts/build/verinfo.py" }, {"@echo Emitting " .. rctarget .. "vers.rc" .. "...", PYTHON .. " $(1) -r -b " .. rctarget .. " $(<) > $(@)" }},
+ { GEN_DIR .. "version.cpp" , GEN_DIR .. "resource/" .. rctarget .. "vers.rc", { MAME_DIR .. "scripts/build/verinfo.py" }, {"@echo Emitting " .. rctarget .. "vers.rc" .. "...", PYTHON .. " $(1) -r -b " .. rctarget .. " $(<) > $(@)" }},
}
configuration { "vs*" }
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(MAME_DIR .. "src/version.cpp","\\") .. " > " .. path.translate(GEN_DIR .. "resource/" .. 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 { }
if _OPTIONS["DEBUG_DIR"]~=nil then
- debugabsolutedir(_OPTIONS["DEBUG_DIR"])
+ debugdir(_OPTIONS["DEBUG_DIR"])
else
debugdir (MAME_DIR)
end
diff --git a/docs/release/scripts/src/mame/frontend.lua b/docs/release/scripts/src/mame/frontend.lua
index ea9bb933cfc..e35bed2da07 100644
--- a/docs/release/scripts/src/mame/frontend.lua
+++ b/docs/release/scripts/src/mame/frontend.lua
@@ -75,6 +75,8 @@ files {
MAME_DIR .. "src/frontend/mame/pluginopts.h",
MAME_DIR .. "src/frontend/mame/ui/ui.cpp",
MAME_DIR .. "src/frontend/mame/ui/ui.h",
+ MAME_DIR .. "src/frontend/mame/ui/text.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/text.h",
MAME_DIR .. "src/frontend/mame/ui/devctrl.h",
MAME_DIR .. "src/frontend/mame/ui/menu.cpp",
MAME_DIR .. "src/frontend/mame/ui/menu.h",
diff --git a/docs/release/scripts/src/netlist.lua b/docs/release/scripts/src/netlist.lua
index aa00ec2c194..58fdf39f6a0 100644
--- a/docs/release/scripts/src/netlist.lua
+++ b/docs/release/scripts/src/netlist.lua
@@ -14,6 +14,11 @@ project "netlist"
kind (LIBTYPE)
addprojectflags()
+
+
+ defines {
+ "__STDC_CONSTANT_MACROS",
+ }
includedirs {
MAME_DIR .. "src/lib/netlist",
@@ -27,7 +32,6 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/nl_dice_compat.h",
MAME_DIR .. "src/lib/netlist/nl_lists.h",
MAME_DIR .. "src/lib/netlist/nl_time.h",
- MAME_DIR .. "src/lib/netlist/nl_util.h",
MAME_DIR .. "src/lib/netlist/nl_base.cpp",
MAME_DIR .. "src/lib/netlist/nl_base.h",
MAME_DIR .. "src/lib/netlist/nl_parser.cpp",
@@ -39,11 +43,14 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/plib/pconfig.h",
MAME_DIR .. "src/lib/netlist/plib/palloc.cpp",
MAME_DIR .. "src/lib/netlist/plib/palloc.h",
+ MAME_DIR .. "src/lib/netlist/plib/pchrono.cpp",
+ MAME_DIR .. "src/lib/netlist/plib/pchrono.h",
MAME_DIR .. "src/lib/netlist/plib/pfmtlog.cpp",
MAME_DIR .. "src/lib/netlist/plib/pfmtlog.h",
MAME_DIR .. "src/lib/netlist/plib/plists.h",
MAME_DIR .. "src/lib/netlist/plib/pdynlib.cpp",
MAME_DIR .. "src/lib/netlist/plib/pdynlib.h",
+ MAME_DIR .. "src/lib/netlist/plib/poptions.cpp",
MAME_DIR .. "src/lib/netlist/plib/poptions.h",
MAME_DIR .. "src/lib/netlist/plib/pparser.cpp",
MAME_DIR .. "src/lib/netlist/plib/pparser.h",
@@ -56,6 +63,8 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/plib/pstream.cpp",
MAME_DIR .. "src/lib/netlist/plib/pstream.h",
MAME_DIR .. "src/lib/netlist/plib/ptypes.h",
+ MAME_DIR .. "src/lib/netlist/plib/putil.cpp",
+ MAME_DIR .. "src/lib/netlist/plib/putil.h",
MAME_DIR .. "src/lib/netlist/tools/nl_convert.cpp",
MAME_DIR .. "src/lib/netlist/tools/nl_convert.h",
MAME_DIR .. "src/lib/netlist/analog/nld_bjt.cpp",
@@ -136,9 +145,10 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/devices/nld_log.h",
MAME_DIR .. "src/lib/netlist/devices/nld_system.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_system.h",
- MAME_DIR .. "src/lib/netlist/devices/nld_cmos.h",
MAME_DIR .. "src/lib/netlist/devices/nld_truthtable.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_truthtable.h",
+ MAME_DIR .. "src/lib/netlist/devices/nlid_cmos.h",
+ MAME_DIR .. "src/lib/netlist/devices/nlid_system.h",
MAME_DIR .. "src/lib/netlist/macro/nlm_ttl74xx.cpp",
MAME_DIR .. "src/lib/netlist/macro/nlm_ttl74xx.h",
MAME_DIR .. "src/lib/netlist/macro/nlm_cd4xxx.cpp",
diff --git a/docs/release/scripts/src/osd/modules.lua b/docs/release/scripts/src/osd/modules.lua
index a05e55ee4c6..b8e5bb61b83 100644
--- a/docs/release/scripts/src/osd/modules.lua
+++ b/docs/release/scripts/src/osd/modules.lua
@@ -96,6 +96,8 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/output/none.cpp",
MAME_DIR .. "src/osd/modules/output/console.cpp",
MAME_DIR .. "src/osd/modules/output/network.cpp",
+ MAME_DIR .. "src/osd/modules/output/win32_output.cpp",
+ MAME_DIR .. "src/osd/modules/output/win32_output.h",
MAME_DIR .. "src/osd/modules/ipc/tcp_connection.cpp",
MAME_DIR .. "src/osd/modules/ipc/tcp_connection.h",
MAME_DIR .. "src/osd/modules/ipc/tcp_server.cpp",
@@ -242,7 +244,7 @@ function qtdebuggerbuild()
}
local version = str_to_version(_OPTIONS["gcc_version"])
if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs")) then
- configuration { "gmake" }
+ configuration { "gmake or ninja" }
if (version >= 30600) then
buildoptions {
"-Wno-inconsistent-missing-override",
diff --git a/docs/release/scripts/src/osd/newui.lua b/docs/release/scripts/src/osd/newui.lua
index a86228e7c4c..a2e95a665da 100644
--- a/docs/release/scripts/src/osd/newui.lua
+++ b/docs/release/scripts/src/osd/newui.lua
@@ -130,7 +130,6 @@ project ("osd_" .. _OPTIONS["osd"])
}
files {
- MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp",
MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h",
MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp",
MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h",
@@ -225,7 +224,6 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/strconv.cpp",
MAME_DIR .. "src/osd/strconv.h",
MAME_DIR .. "src/osd/windows/main.cpp",
- MAME_DIR .. "src/osd/windows/windir.cpp",
MAME_DIR .. "src/osd/osdsync.cpp",
MAME_DIR .. "src/osd/osdsync.h",
MAME_DIR .. "src/osd/windows/winutf8.cpp",
@@ -234,6 +232,7 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/windows/winutil.h",
MAME_DIR .. "src/osd/modules/osdmodule.cpp",
MAME_DIR .. "src/osd/modules/osdmodule.h",
+ MAME_DIR .. "src/osd/modules/file/windir.cpp",
MAME_DIR .. "src/osd/modules/file/winfile.cpp",
MAME_DIR .. "src/osd/modules/file/winfile.h",
MAME_DIR .. "src/osd/modules/file/winptty.cpp",
diff --git a/docs/release/scripts/src/osd/sdl.lua b/docs/release/scripts/src/osd/sdl.lua
index d1a83229698..4094e48c6be 100644
--- a/docs/release/scripts/src/osd/sdl.lua
+++ b/docs/release/scripts/src/osd/sdl.lua
@@ -239,7 +239,7 @@ elseif _OPTIONS["targetos"]=="macosx" then
SDL_NETWORK = "pcap"
end
-if _OPTIONS["with-bundled-sdl2"]~=nil or _OPTIONS["targetos"]=="android" then
+if _OPTIONS["with-bundled-sdl2"]~=nil then
includedirs {
GEN_DIR .. "includes",
}
@@ -295,10 +295,12 @@ if BASE_TARGETOS=="unix" then
"/usr/openwin/lib",
}
end
- if _OPTIONS["with-bundled-sdl2"]~=nil and _OPTIONS["targetos"]~="android" then
- links {
- "SDL2",
- }
+ if _OPTIONS["with-bundled-sdl2"]~=nil then
+ if _OPTIONS["targetos"]~="android" then
+ links {
+ "SDL2",
+ }
+ end
else
local str = backtick(sdlconfigcmd() .. " --libs")
addlibfromstring(str)
@@ -459,7 +461,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/sdl/sdldir.cpp",
MAME_DIR .. "src/osd/modules/osdmodule.cpp",
MAME_DIR .. "src/osd/modules/osdmodule.h",
MAME_DIR .. "src/osd/modules/lib/osdlib_" .. SDLOS_TARGETOS .. ".cpp",
@@ -468,6 +469,7 @@ project ("ocore_" .. _OPTIONS["osd"])
if BASE_TARGETOS=="unix" then
files {
+ MAME_DIR .. "src/osd/modules/file/posixdir.cpp",
MAME_DIR .. "src/osd/modules/file/posixfile.cpp",
MAME_DIR .. "src/osd/modules/file/posixfile.h",
MAME_DIR .. "src/osd/modules/file/posixptty.cpp",
@@ -478,6 +480,7 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/windows",
}
files {
+ MAME_DIR .. "src/osd/modules/file/windir.cpp",
MAME_DIR .. "src/osd/modules/file/winfile.cpp",
MAME_DIR .. "src/osd/modules/file/winfile.h",
MAME_DIR .. "src/osd/modules/file/winptty.cpp",
diff --git a/docs/release/scripts/src/osd/windows.lua b/docs/release/scripts/src/osd/windows.lua
index b4be2dc7ce4..a6e40c7aadc 100644
--- a/docs/release/scripts/src/osd/windows.lua
+++ b/docs/release/scripts/src/osd/windows.lua
@@ -154,8 +154,6 @@ project ("osd_" .. _OPTIONS["osd"])
}
files {
- MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp",
- MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h",
MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp",
MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h",
MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.h",
@@ -246,16 +244,48 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/osdsync.cpp",
MAME_DIR .. "src/osd/osdsync.h",
MAME_DIR .. "src/osd/windows/main.cpp",
- MAME_DIR .. "src/osd/windows/windir.cpp",
MAME_DIR .. "src/osd/windows/winutf8.cpp",
MAME_DIR .. "src/osd/windows/winutf8.h",
MAME_DIR .. "src/osd/windows/winutil.cpp",
MAME_DIR .. "src/osd/windows/winutil.h",
MAME_DIR .. "src/osd/modules/osdmodule.cpp",
MAME_DIR .. "src/osd/modules/osdmodule.h",
+ MAME_DIR .. "src/osd/modules/file/windir.cpp",
MAME_DIR .. "src/osd/modules/file/winfile.cpp",
MAME_DIR .. "src/osd/modules/file/winfile.h",
MAME_DIR .. "src/osd/modules/file/winptty.cpp",
MAME_DIR .. "src/osd/modules/file/winsocket.cpp",
MAME_DIR .. "src/osd/modules/lib/osdlib_win32.cpp",
}
+
+
+
+--------------------------------------------------
+-- ledutil
+--------------------------------------------------
+
+if _OPTIONS["with-tools"] then
+ project("ledutil")
+ uuid ("061293ca-7290-44ac-b2b5-5913ae8dc9c0")
+ kind "ConsoleApp"
+
+ flags {
+ "Symbols", -- always include minimum symbols for executables
+ }
+
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
+ targetdir(MAME_DIR)
+ end
+
+ links {
+ "ocore_" .. _OPTIONS["osd"],
+ }
+
+ includedirs {
+ MAME_DIR .. "src/osd",
+ }
+
+ files {
+ MAME_DIR .. "src/osd/windows/ledutil.cpp",
+ }
+end
diff --git a/docs/release/scripts/src/osd/winui.lua b/docs/release/scripts/src/osd/winui.lua
index 1056384647d..85f122bfa16 100644
--- a/docs/release/scripts/src/osd/winui.lua
+++ b/docs/release/scripts/src/osd/winui.lua
@@ -153,7 +153,6 @@ project ("osd_" .. _OPTIONS["osd"])
}
files {
- MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp",
MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h",
MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp",
MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h",
@@ -276,7 +275,6 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/strconv.cpp",
MAME_DIR .. "src/osd/strconv.h",
MAME_DIR .. "src/osd/windows/main.cpp",
- MAME_DIR .. "src/osd/windows/windir.cpp",
MAME_DIR .. "src/osd/osdsync.cpp",
MAME_DIR .. "src/osd/osdsync.h",
MAME_DIR .. "src/osd/windows/winutf8.cpp",
@@ -285,6 +283,7 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/windows/winutil.h",
MAME_DIR .. "src/osd/modules/osdmodule.cpp",
MAME_DIR .. "src/osd/modules/osdmodule.h",
+ MAME_DIR .. "src/osd/modules/file/windir.cpp",
MAME_DIR .. "src/osd/modules/file/winfile.cpp",
MAME_DIR .. "src/osd/modules/file/winfile.h",
MAME_DIR .. "src/osd/modules/file/winptty.cpp",
diff --git a/docs/release/scripts/src/tests.lua b/docs/release/scripts/src/tests.lua
index b5bb5b37366..e0a8da88d75 100644
--- a/docs/release/scripts/src/tests.lua
+++ b/docs/release/scripts/src/tests.lua
@@ -16,7 +16,7 @@ project "gtest"
uuid "fa306a8d-fb10-4d4a-9d2e-fdb9076407b4"
kind "StaticLib"
- configuration { "gmake" }
+ configuration { "gmake or ninja" }
buildoptions {
"-Wno-undef",
"-Wno-unused-variable",
@@ -52,7 +52,7 @@ project("mametests")
targetdir(MAME_DIR)
end
- configuration { "gmake" }
+ configuration { "gmake or ninja" }
buildoptions {
"-Wno-undef",
}
diff --git a/docs/release/scripts/src/tools.lua b/docs/release/scripts/src/tools.lua
index a2e5ad73496..6832190f5d3 100644
--- a/docs/release/scripts/src/tools.lua
+++ b/docs/release/scripts/src/tools.lua
@@ -87,7 +87,7 @@ includedirs {
files {
MAME_DIR .. "src/tools/chdman.cpp",
MAME_DIR .. "src/emu/emucore.cpp",
- MAME_DIR .. "src/version.cpp",
+ GEN_DIR .. "version.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -165,6 +165,7 @@ links {
includedirs {
MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/devices",
MAME_DIR .. "src/emu",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
@@ -779,7 +780,7 @@ if _OPTIONS["targetos"] == "macosx" then
MAME_DIR .. "src/tools/aueffectutil.mm",
}
- configuration { }
+ configuration { }
strip()
end
diff --git a/docs/release/scripts/src/video.lua b/docs/release/scripts/src/video.lua
index 2220e65fff9..95cccd99bfe 100644
--- a/docs/release/scripts/src/video.lua
+++ b/docs/release/scripts/src/video.lua
@@ -806,6 +806,18 @@ end
--------------------------------------------------
--
+--@src/devices/video/zeus2.h,VIDEOS["ZEUS2"] = true
+--------------------------------------------------
+
+if (VIDEOS["ZEUS2"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/zeus2.cpp",
+ MAME_DIR .. "src/devices/video/zeus2.h",
+ }
+end
+
+--------------------------------------------------
+--
--@src/devices/video/voodoo.h,VIDEOS["VOODOO"] = true
--------------------------------------------------
diff --git a/docs/release/scripts/target/mame/arcade.lua b/docs/release/scripts/target/mame/arcade.lua
index 3c45c1f9d6d..df58452777d 100644
--- a/docs/release/scripts/target/mame/arcade.lua
+++ b/docs/release/scripts/target/mame/arcade.lua
@@ -332,6 +332,7 @@ VIDEOS["V9938"] = true
--VIDEOS["VIC4567"] = true
VIDEOS["VOODOO"] = true
VIDEOS["VOODOO_PCI"] = true
+VIDEOS["ZEUS2"] = true
--------------------------------------------------
-- specify available machine cores
@@ -429,6 +430,7 @@ MACHINES["LC89510"] = true
MACHINES["LDPR8210"] = true
MACHINES["LDSTUB"] = true
MACHINES["LDV1000"] = true
+MACHINES["LDP1000"] = true
MACHINES["LDVP931"] = true
--MACHINES["LH5810"] = true
MACHINES["LINFLASH"] = true
@@ -640,6 +642,7 @@ BUSES["SAT_CTRL"] = true
BUSES["SCSI"] = true
--BUSES["SCV"] = true
BUSES["SEGA8"] = true
+BUSES["SG1000_EXP"] = true
BUSES["SMS_CTRL"] = true
BUSES["SMS_EXP"] = true
--BUSES["SNES"] = true
@@ -1168,6 +1171,8 @@ files {
MAME_DIR .. "src/mame/machine/mathbox.cpp",
MAME_DIR .. "src/mame/machine/mathbox.h",
MAME_DIR .. "src/mame/machine/slapstic.cpp",
+ MAME_DIR .. "src/mame/machine/atarixga.cpp",
+ MAME_DIR .. "src/mame/machine/atarixga.h",
MAME_DIR .. "src/mame/audio/atarijsa.cpp",
MAME_DIR .. "src/mame/audio/atarijsa.h",
MAME_DIR .. "src/mame/audio/cage.cpp",
@@ -1349,7 +1354,6 @@ files {
createMAMEProjects(_target, _subtarget, "cinemat")
files {
- MAME_DIR .. "src/mame/drivers/ataxx.cpp",
MAME_DIR .. "src/mame/drivers/cinemat.cpp",
MAME_DIR .. "src/mame/includes/cinemat.h",
MAME_DIR .. "src/mame/audio/cinemat.cpp",
@@ -2115,6 +2119,9 @@ files {
MAME_DIR .. "src/mame/drivers/ddribble.cpp",
MAME_DIR .. "src/mame/includes/ddribble.h",
MAME_DIR .. "src/mame/video/ddribble.cpp",
+ MAME_DIR .. "src/mame/drivers/divebomb.cpp",
+ MAME_DIR .. "src/mame/includes/divebomb.h",
+ MAME_DIR .. "src/mame/video/divebomb.cpp",
MAME_DIR .. "src/mame/drivers/djmain.cpp",
MAME_DIR .. "src/mame/includes/djmain.h",
MAME_DIR .. "src/mame/video/djmain.cpp",
@@ -3044,6 +3051,8 @@ files {
MAME_DIR .. "src/mame/machine/s32comm.h",
MAME_DIR .. "src/mame/machine/m1comm.cpp",
MAME_DIR .. "src/mame/machine/m1comm.h",
+ MAME_DIR .. "src/mame/machine/m2comm.cpp",
+ MAME_DIR .. "src/mame/machine/m2comm.h",
MAME_DIR .. "src/mame/audio/dsbz80.cpp",
MAME_DIR .. "src/mame/audio/dsbz80.h",
MAME_DIR .. "src/mame/drivers/model2.cpp",
@@ -3261,8 +3270,10 @@ files {
MAME_DIR .. "src/mame/includes/raiden2.h",
MAME_DIR .. "src/mame/machine/r2crypt.cpp",
MAME_DIR .. "src/mame/machine/r2crypt.h",
- MAME_DIR .. "src/mame/machine/raiden2cop.cpp",
- MAME_DIR .. "src/mame/machine/raiden2cop.h",
+ MAME_DIR .. "src/mame/machine/seibucop/seibucop.cpp",
+ MAME_DIR .. "src/mame/machine/seibucop/seibucop_dma.hxx",
+ MAME_DIR .. "src/mame/machine/seibucop/seibucop_cmd.hxx",
+ MAME_DIR .. "src/mame/machine/seibucop/seibucop.h",
MAME_DIR .. "src/mame/drivers/r2dx_v33.cpp",
MAME_DIR .. "src/mame/drivers/seibuspi.cpp",
MAME_DIR .. "src/mame/includes/seibuspi.h",
@@ -4221,6 +4232,11 @@ files {
--------------------------------------------------
createMAMEProjects(_target, _subtarget, "misc")
+
+includedirs {
+ ext_includedir("jpeg"),
+}
+
files {
MAME_DIR .. "src/mame/drivers/1945kiii.cpp",
MAME_DIR .. "src/mame/drivers/39in1.cpp",
diff --git a/docs/release/scripts/target/mame/mess.lua b/docs/release/scripts/target/mame/mess.lua
index 13898021fd6..1063bd71a93 100644
--- a/docs/release/scripts/target/mame/mess.lua
+++ b/docs/release/scripts/target/mame/mess.lua
@@ -132,6 +132,7 @@ CPUS["E0C6200"] = true
CPUS["MELPS4"] = true
CPUS["HPHYBRID"] = true
CPUS["SM510"] = true
+CPUS["MB86901"] = true
--------------------------------------------------
-- specify available sound cores; some of these are
@@ -583,6 +584,7 @@ MACHINES["SMARTMEDIA"] = true
MACHINES["APPLE_DRIVE"] = true
MACHINES["APPLE_FDC"] = true
MACHINES["SONY_DRIVE"] = true
+MACHINES["SCNXX562"] = true
--------------------------------------------------
-- specify available bus cores
@@ -618,6 +620,7 @@ BUSES["CRVISION"] = true
BUSES["DMV"] = true
BUSES["ECBBUS"] = true
BUSES["ECONET"] = true
+BUSES["ELECTRON"] = true
BUSES["EP64"] = true
BUSES["EPSON_SIO"] = true
BUSES["GAMEBOY"] = true
@@ -653,6 +656,7 @@ BUSES["PC_JOY"] = true
BUSES["PC_KBD"] = true
BUSES["PET"] = true
BUSES["PLUS4"] = true
+BUSES["POFO"] = true
BUSES["PSX_CONTROLLER"] = true
BUSES["QL"] = true
BUSES["RS232"] = true
@@ -662,6 +666,7 @@ BUSES["SATURN"] = true
BUSES["SCSI"] = true
BUSES["SCV"] = true
BUSES["SEGA8"] = true
+BUSES["SG1000_EXP"] = true
BUSES["SMS_CTRL"] = true
BUSES["SMS_EXP"] = true
BUSES["SNES"] = true
@@ -1067,7 +1072,7 @@ files {
MAME_DIR .. "src/mame/machine/xbox.cpp",
MAME_DIR .. "src/mame/includes/saturn.h",
MAME_DIR .. "src/mame/drivers/saturn.cpp",
- MAME_DIR .. "src/mame/machine/saturn.cpp",
+ MAME_DIR .. "src/mame/machine/saturn.cpp",
}
end
--------------------------------------------------
@@ -1304,8 +1309,7 @@ files {
MAME_DIR .. "src/mame/audio/lynx.cpp",
MAME_DIR .. "src/mame/audio/lynx.h",
MAME_DIR .. "src/mame/machine/lynx.cpp",
- MAME_DIR .. "src/mame/drivers/portfoli.cpp",
- MAME_DIR .. "src/mame/includes/portfoli.h",
+ MAME_DIR .. "src/mame/drivers/pofo.cpp",
}
createMESSProjects(_target, _subtarget, "att")
@@ -1725,6 +1729,7 @@ files {
createMESSProjects(_target, _subtarget, "force")
files {
+ MAME_DIR .. "src/mame/drivers/fccpu30.cpp",
MAME_DIR .. "src/mame/drivers/force68k.cpp",
}
@@ -1859,6 +1864,8 @@ files {
MAME_DIR .. "src/mame/drivers/ipc.cpp",
MAME_DIR .. "src/mame/drivers/ipds.cpp",
MAME_DIR .. "src/mame/drivers/isbc.cpp",
+ MAME_DIR .. "src/mame/drivers/isbc8010.cpp",
+ MAME_DIR .. "src/mame/drivers/isbc8030.cpp",
MAME_DIR .. "src/mame/machine/isbc_215g.cpp",
MAME_DIR .. "src/mame/machine/isbc_215g.h",
MAME_DIR .. "src/mame/drivers/rex6000.cpp",
@@ -2611,6 +2618,7 @@ files {
MAME_DIR .. "src/mame/drivers/sun1.cpp",
MAME_DIR .. "src/mame/drivers/sun2.cpp",
MAME_DIR .. "src/mame/drivers/sun3.cpp",
+ MAME_DIR .. "src/mame/drivers/sun3x.cpp",
MAME_DIR .. "src/mame/drivers/sun4.cpp",
}
@@ -2678,6 +2686,7 @@ files {
MAME_DIR .. "src/mame/drivers/tek405x.cpp",
MAME_DIR .. "src/mame/includes/tek405x.h",
MAME_DIR .. "src/mame/drivers/tek410x.cpp",
+ MAME_DIR .. "src/mame/drivers/tek440x.cpp",
MAME_DIR .. "src/mame/drivers/tekxp33x.cpp",
}
@@ -2894,6 +2903,7 @@ files {
createMESSProjects(_target, _subtarget, "usp")
files {
MAME_DIR .. "src/mame/drivers/patinho_feio.cpp",
+ MAME_DIR .. "src/mame/includes/patinhofeio.h",
}
createMESSProjects(_target, _subtarget, "veb")
@@ -3034,6 +3044,7 @@ files {
createMESSProjects(_target, _subtarget, "skeleton")
files {
+ MAME_DIR .. "src/mame/drivers/alesis_qs.cpp",
MAME_DIR .. "src/mame/drivers/alphasma.cpp",
MAME_DIR .. "src/mame/drivers/ampro.cpp",
MAME_DIR .. "src/mame/drivers/amust.cpp",
@@ -3188,6 +3199,7 @@ files {
MAME_DIR .. "src/mame/drivers/v6809.cpp",
MAME_DIR .. "src/mame/drivers/vector4.cpp",
MAME_DIR .. "src/mame/drivers/vii.cpp",
+ MAME_DIR .. "src/mame/drivers/vsmilepro.cpp",
MAME_DIR .. "src/mame/drivers/wicat.cpp",
MAME_DIR .. "src/mame/drivers/xor100.cpp",
MAME_DIR .. "src/mame/includes/xor100.h",
diff --git a/docs/release/scripts/target/mame/tiny.lua b/docs/release/scripts/target/mame/tiny.lua
index 4e3d4167587..b9ed31261d5 100644
--- a/docs/release/scripts/target/mame/tiny.lua
+++ b/docs/release/scripts/target/mame/tiny.lua
@@ -61,6 +61,7 @@ MACHINES["PIT8253"] = true
MACHINES["Z80CTC"] = true
MACHINES["68681"] = true
MACHINES["BANKDEV"] = true
+MACHINES["GEN_LATCH"] = true
MACHINES["WATCHDOG"] = true
diff --git a/docs/release/scripts/toolchain.lua b/docs/release/scripts/toolchain.lua
index e717102f44e..6046b4d97d8 100644
--- a/docs/release/scripts/toolchain.lua
+++ b/docs/release/scripts/toolchain.lua
@@ -95,6 +95,8 @@ function toolchain(_buildDir, _subDir)
local androidPlatform = "android-14"
if _OPTIONS["with-android"] then
androidPlatform = "android-" .. _OPTIONS["with-android"]
+ elseif _OPTIONS["PLATFORM"]:find("64", -2) then
+ androidPlatform = "android-21"
end
local iosPlatform = ""
@@ -107,90 +109,48 @@ function toolchain(_buildDir, _subDir)
windowsPlatform = _OPTIONS["with-windows"]
end
- if _ACTION == "gmake" then
+ if _ACTION == "gmake" or _ACTION == "ninja" then
if nil == _OPTIONS["gcc"] or nil == _OPTIONS["gcc_version"] then
print("GCC flavor and version must be specified!")
os.exit(1)
end
- if "android-arm" == _OPTIONS["gcc"] then
-
- if not os.getenv("ANDROID_NDK_ARM") or not os.getenv("ANDROID_NDK_ROOT") then
- print("Set ANDROID_NDK_ARM and ANDROID_NDK_ROOT envrionment variables.")
+ if string.find(_OPTIONS["gcc"], "android") then
+ -- 64-bit android platform requires >= 21
+ if _OPTIONS["PLATFORM"]:find("64", -2) and tonumber(androidPlatform:sub(9)) < 21 then
+ error("64-bit android requires platform 21 or higher")
end
-
- premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe"
- premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe"
- premake.gcc.ar = "$(ANDROID_NDK_ARM)/bin/arm-linux-androideabi-ar"
- premake.gcc.llvm = true
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-arm")
- end
-
- if "android-arm64" == _OPTIONS["gcc"] then
-
- if not os.getenv("ANDROID_NDK_ARM64") or not os.getenv("ANDROID_NDK_ROOT") then
- print("Set ANDROID_NDK_ARM64 and ANDROID_NDK_ROOT envrionment variables.")
+ if not os.getenv("ANDROID_NDK_ROOT") then
+ print("Set ANDROID_NDK_ROOT environment variable.")
end
-
- premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe"
- premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe"
- premake.gcc.ar = "$(ANDROID_NDK_ARM64)/bin/aarch64-linux-android-ar.exe"
- premake.gcc.llvm = true
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-arm64")
- end
-
- if "android-mips" == _OPTIONS["gcc"] then
-
- if not os.getenv("ANDROID_NDK_MIPS") or not os.getenv("ANDROID_NDK_ROOT") then
- print("Set ANDROID_NDK_MIPS and ANDROID_NDK_ROOT envrionment variables.")
+ if not os.getenv("ANDROID_NDK_LLVM") then
+ print("Set ANDROID_NDK_LLVM envrionment variable.")
end
-
- premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe"
- premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe"
- premake.gcc.ar = "$(ANDROID_NDK_MIPS)/bin/mipsel-linux-android-ar"
- premake.gcc.llvm = true
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-mips")
- end
-
- if "android-mips64" == _OPTIONS["gcc"] then
-
- if not os.getenv("ANDROID_NDK_MIPS64") or not os.getenv("ANDROID_NDK_ROOT") then
- print("Set ANDROID_NDK_MIPS64 and ANDROID_NDK_ROOT envrionment variables.")
+ platform_ndk_env = "ANDROID_NDK_" .. _OPTIONS["PLATFORM"]:upper()
+ if not os.getenv(platform_ndk_env) then
+ print("Set " .. platform_ndk_env .. " environment variable.")
end
- premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe"
- premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe"
- premake.gcc.ar = "$(ANDROID_NDK_MIPS64)/bin/mips64el-linux-android-ar.exe"
- premake.gcc.llvm = true
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-mips64")
- end
-
- if "android-x86" == _OPTIONS["gcc"] then
+ 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",
+ }
- if not os.getenv("ANDROID_NDK_X86") or not os.getenv("ANDROID_NDK_ROOT") then
- print("Set ANDROID_NDK_X86 and ANDROID_NDK_ROOT envrionment variables.")
- end
+ toolchainPrefix = os.getenv(platform_ndk_env) .. "/bin/" .. platformToolchainMap[_OPTIONS["PLATFORM"]] .. "-"
- premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe"
- premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe"
- premake.gcc.ar = "$(ANDROID_NDK_X86)/bin/i686-linux-android-ar"
+ premake.gcc.cc = "$(ANDROID_NDK_LLVM)/bin/clang"
+ premake.gcc.cxx = "$(ANDROID_NDK_LLVM)/bin/clang++"
+ premake.gcc.ar = toolchainPrefix .. "ar"
premake.gcc.llvm = true
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-x86")
- end
- if "android-x64" == _OPTIONS["gcc"] then
-
- if not os.getenv("ANDROID_NDK_X64") or not os.getenv("ANDROID_NDK_ROOT") then
- print("Set ANDROID_NDK_X64 and ANDROID_NDK_ROOT envrionment variables.")
- end
-
- premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe"
- premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe"
- premake.gcc.ar = "$(ANDROID_NDK_X64)/bin/x86_64-linux-android-ar.exe"
- premake.gcc.llvm = true
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-x64")
+ location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-" .. _OPTIONS["PLATFORM"])
end
+
if "asmjs" == _OPTIONS["gcc"] then
if not os.getenv("EMSCRIPTEN") then
@@ -373,7 +333,7 @@ function toolchain(_buildDir, _subDir)
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-ci20")
end
- elseif _ACTION == "vs2013" or _ACTION == "vs2015" then
+ elseif _ACTION == "vs2013" or _ACTION == "vs2015" or _ACTION == "vs2015-fastbuild" then
if (_ACTION .. "-clang") == _OPTIONS["vs"] then
premake.vstudio.toolset = ("LLVM-" .. _ACTION)
@@ -813,6 +773,8 @@ function toolchain(_buildDir, _subDir)
targetdir (_buildDir .. "openbsd" .. "/bin/x64/Debug")
configuration { "android-*" }
+ targetdir (_buildDir .. "android-" .. _OPTIONS["PLATFORM"] .. "/bin")
+ objdir (_buildDir .. "android-" .. _OPTIONS["PLATFORM"] .. "/obj")
includedirs {
MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos",
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libcxx/include",
@@ -857,8 +819,6 @@ function toolchain(_buildDir, _subDir)
configuration { "android-arm" }
- targetdir (_buildDir .. "android-arm" .. "/bin")
- objdir (_buildDir .. "android-arm" .. "/obj")
libdirs {
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/lib",
@@ -885,9 +845,6 @@ function toolchain(_buildDir, _subDir)
}
configuration { "android-arm64" }
- androidPlatform = "android-21" -- supported from API 21
- targetdir (_buildDir .. "android-arm64" .. "/bin")
- objdir (_buildDir .. "android-arm64" .. "/obj")
libdirs {
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/arm64-v8a",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm64/usr/lib64",
@@ -908,8 +865,6 @@ function toolchain(_buildDir, _subDir)
}
configuration { "android-mips" }
- targetdir (_buildDir .. "android-mips" .. "/bin")
- objdir (_buildDir .. "android-mips" .. "/obj")
libdirs {
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/mips",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/",
@@ -930,9 +885,6 @@ function toolchain(_buildDir, _subDir)
}
configuration { "android-mips64" }
- androidPlatform = "android-21" -- supported from API 21
- targetdir (_buildDir .. "android-mips64" .. "/bin")
- objdir (_buildDir .. "android-mips64" .. "/obj")
libdirs {
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/mips64",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64/usr/lib64/",
@@ -953,8 +905,6 @@ function toolchain(_buildDir, _subDir)
}
configuration { "android-x86" }
- targetdir (_buildDir .. "android-x86" .. "/bin")
- objdir (_buildDir .. "android-x86" .. "/obj")
libdirs {
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/x86",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86/usr/lib",
@@ -977,9 +927,6 @@ function toolchain(_buildDir, _subDir)
}
configuration { "android-x64" }
- androidPlatform = "android-21" -- supported from API 21
- targetdir (_buildDir .. "android-x64" .. "/bin")
- objdir (_buildDir .. "android-x64" .. "/obj")
libdirs {
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/x86_64",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86_64/usr/lib64",
@@ -1101,22 +1048,10 @@ function strip()
"$(SILENT) " .. (_OPTIONS['TOOLCHAIN'] and toolchainPrefix) .. "strip \"$(TARGET)\"",
}
- configuration { "android-arm", "Release" }
- postbuildcommands {
- "$(SILENT) echo Stripping symbols.",
- "$(SILENT) $(ANDROID_NDK_ARM)/bin/arm-linux-androideabi-strip -s \"$(TARGET)\""
- }
-
- configuration { "android-mips", "Release" }
- postbuildcommands {
- "$(SILENT) echo Stripping symbols.",
- "$(SILENT) $(ANDROID_NDK_MIPS)/bin/mipsel-linux-android-strip -s \"$(TARGET)\""
- }
-
- configuration { "android-x86", "Release" }
+ configuration { "android-*", "Release" }
postbuildcommands {
"$(SILENT) echo Stripping symbols.",
- "$(SILENT) $(ANDROID_NDK_X86)/bin/i686-linux-android-strip -s \"$(TARGET)\""
+ "$(SILENT) " .. toolchainPrefix .. "strip -s \"$(TARGET)\""
}
configuration { "linux-* or rpi", "Release" }