summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build/makelist.py19
-rw-r--r--scripts/genie.lua13
-rw-r--r--scripts/src/3rdparty.lua63
-rw-r--r--scripts/src/devices.lua37
-rw-r--r--scripts/src/emu.lua13
-rw-r--r--scripts/src/machine.lua12
-rw-r--r--scripts/src/main.lua6
-rw-r--r--scripts/src/osd/modules.lua24
-rw-r--r--scripts/src/osd/osdmini.lua1
-rw-r--r--scripts/src/osd/windows.lua2
-rw-r--r--scripts/src/tests.lua5
-rw-r--r--scripts/src/tools.lua16
-rw-r--r--scripts/target/mame/arcade.lua14
-rw-r--r--scripts/target/mame/mess.lua12
-rw-r--r--scripts/toolchain.lua26
15 files changed, 92 insertions, 171 deletions
diff --git a/scripts/build/makelist.py b/scripts/build/makelist.py
index 329ff374520..a9b450474e2 100644
--- a/scripts/build/makelist.py
+++ b/scripts/build/makelist.py
@@ -9,6 +9,8 @@ import sys
drivlist = []
sourcelist = []
+filter_addlist = []
+filter_removelist = []
def parse_file(srcfile):
try:
@@ -57,9 +59,9 @@ def parse_file(srcfile):
if not all(((c >='a' and c<='z') or (c>='0' and c<='9') or c=='_') for c in drivname):
sys.stderr.write("%s:%d - Invalid character in driver \"%s\"\n" % (srcfile, linenum, drivname))
return 1
- else:
+ else:
if (curr_source == '') or (len(sourcelist)==0) or (curr_source in sourcelist):
- drivlist.append(drivname)
+ drivlist.append(drivname)
return 0
def parse_filter_file(srcfile):
@@ -102,10 +104,16 @@ def parse_filter_file(srcfile):
sys.stderr.write("Importing drivers from '%s'\n" % sourcename[1:])
parse_filter_file(sourcename[1:])
continue
+ if sourcename[0]=='+':
+ filter_addlist.append(sourcename[1:])
+ continue
+ if sourcename[0]=='-':
+ filter_removelist.append(sourcename[1:])
+ continue
if not all(((c >='a' and c<='z') or (c>='0' and c<='9') or c=='_' or c=='.' or c=='-') for c in sourcename):
sys.stderr.write("%s:%d - Invalid character in driver \"%s\"\n" % (srcfile, linenum, sourcename))
return 1
- else:
+ else:
sourcelist.append(sourcename)
return 0
@@ -128,6 +136,11 @@ if len(drivlist)==0 :
sys.stderr.write("No drivers found\n")
sys.exit(1)
+for x in filter_addlist:
+ drivlist.append(x)
+
+drivlist = [x for x in drivlist if (x not in filter_removelist)]
+
sys.stderr.write("%d driver(s) found\n" % len(drivlist))
# add a reference to the ___empty driver
diff --git a/scripts/genie.lua b/scripts/genie.lua
index ef5c945bb64..ad60bc79252 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -805,6 +805,10 @@ end
"-O".. _OPTIONS["OPTIMIZE"],
"-fno-strict-aliasing"
}
+configuration { "mingw-clang" }
+ buildoptions {
+ "-O1", -- without this executable crash often
+ }
-- add the error warning flag
if _OPTIONS["NOWERROR"]==nil then
@@ -1025,6 +1029,15 @@ if (_OPTIONS["PLATFORM"]=="arm") then
}
end
+if (_OPTIONS["PLATFORM"]=="arm64") then
+ buildoptions {
+ "-Wno-cast-align",
+ }
+ defines {
+ "PTR64=1",
+ }
+end
+
local subdir
if (_OPTIONS["target"] == _OPTIONS["subtarget"]) then
subdir = _OPTIONS["osd"] .. "/" .. _OPTIONS["target"]
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 82fb09947de..62262cef282 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -59,7 +59,7 @@ project "zlib"
kind "StaticLib"
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
+ 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" }
if (version >= 30700) then
buildoptions {
@@ -276,7 +276,7 @@ end
"-Wno-unused-function",
"-O0",
}
- if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then
+ if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android")) then
buildoptions {
"-Wno-enum-conversion",
}
@@ -511,64 +511,6 @@ project "lualibs"
}
--------------------------------------------------
--- luv lua library objects
---------------------------------------------------
-if _OPTIONS["USE_LIBUV"]=="1" then
-project "luv"
- uuid "d98ec5ca-da2a-4a50-88a2-52061ca53871"
- kind "StaticLib"
-
- if _OPTIONS["targetos"]=="windows" then
- defines {
- "_WIN32_WINNT=0x0600",
- }
- end
-
- configuration { "vs*" }
- buildoptions {
- "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
- }
-
- configuration { "gmake" }
- buildoptions_c {
- "-Wno-unused-function",
- "-Wno-strict-prototypes",
- "-Wno-unused-variable",
- "-Wno-undef",
- }
-
- configuration { "not android-*" }
- buildoptions_c {
- "-Wno-maybe-uninitialized",
- }
-
- configuration { "vs2015" }
- buildoptions {
- "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used
- "/wd4703", -- warning C4703: potentially uninitialized local pointer variable 'xxx' used
- }
-
- configuration { }
- defines {
- "LUA_COMPAT_ALL",
- }
-
- includedirs {
- MAME_DIR .. "3rdparty/lua/src",
- MAME_DIR .. "3rdparty/libuv/include",
- }
- if _OPTIONS["with-bundled-lua"] then
- includedirs {
- MAME_DIR .. "3rdparty/luv/deps/lua/src",
- }
- end
-
- files {
- MAME_DIR .. "3rdparty/luv/src/luv.c",
- MAME_DIR .. "3rdparty/luv/src/luv.h",
- }
-end
---------------------------------------------------
-- SQLite3 library objects
--------------------------------------------------
@@ -830,6 +772,7 @@ end
MAME_DIR .. "3rdparty/bgfx/src/shader_dxbc.cpp",
MAME_DIR .. "3rdparty/bgfx/src/shader_dx9bc.cpp",
MAME_DIR .. "3rdparty/bgfx/src/shader_spirv.cpp",
+ MAME_DIR .. "3rdparty/bgfx/src/topology.cpp",
MAME_DIR .. "3rdparty/bgfx/src/vertexdecl.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/bgfx_utils.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/bounds.cpp",
diff --git a/scripts/src/devices.lua b/scripts/src/devices.lua
index 15e53a17cfb..c4a6c9fe0ac 100644
--- a/scripts/src/devices.lua
+++ b/scripts/src/devices.lua
@@ -57,44 +57,7 @@ function devicesProject(_target, _subtarget)
dofile(path.join("src", "machine.lua"))
-if (_OPTIONS["SOURCES"] == nil) then
- project ("bus")
- uuid ("5d782c89-cf7e-4cfe-8f9f-0d4bfc16c91d")
- kind (LIBTYPE)
- targetsubdir(_target .."_" .. _subtarget)
- addprojectflags()
- precompiledheaders()
- options {
- "ArchiveSplit",
- }
-
- includedirs {
- MAME_DIR .. "src/osd",
- MAME_DIR .. "src/emu",
- MAME_DIR .. "src/devices",
- MAME_DIR .. "src/lib/netlist",
- MAME_DIR .. "src/lib",
- MAME_DIR .. "src/lib/util",
- MAME_DIR .. "3rdparty",
- MAME_DIR .. "src/mame", -- used for nes bus devices,some mess bus devices need this
- GEN_DIR .. "emu",
- GEN_DIR .. "emu/layout",
- }
- if _OPTIONS["with-bundled-expat"] then
- includedirs {
- MAME_DIR .. "3rdparty/expat/lib",
- }
- end
- if _OPTIONS["with-bundled-lua"] then
- includedirs {
- MAME_DIR .. "3rdparty/lua/src",
- }
- end
-
dofile(path.join("src", "bus.lua"))
-else
- dofile(path.join("src", "bus.lua"))
-end
if #disasm_files > 0 then
project ("dasm")
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
index c834c314c77..e71103a26b6 100644
--- a/scripts/src/emu.lua
+++ b/scripts/src/emu.lua
@@ -40,7 +40,7 @@ if _OPTIONS["with-bundled-lua"] then
}
end
-if (_OPTIONS["targetos"] == "windows") then
+if (_OPTIONS["targetos"] == "windows" and _OPTIONS["osd"] ~= "osdmini") then
defines {
"UI_WINDOWS",
}
@@ -412,8 +412,17 @@ dependency {
}
+if (_OPTIONS["targetos"]=="asmjs") then
+ custombuildtask {
+ { MAME_DIR .. "src/emu/uismall.png" , GEN_DIR .. "emu/uismall.fh", { MAME_DIR.. "scripts/build/png2bdc.py", MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting uismall.png...", PYTHON .. " $(1) $(<) temp.bdc", PYTHON .. " $(2) temp.bdc $(@) font_uismall UINT8" }},
+ }
+else
+ custombuildtask {
+ { MAME_DIR .. "scripts/font/NotoSans-Bold.bdc", GEN_DIR .. "emu/uismall.fh", { MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting NotoSans-Bold.bdc...", PYTHON .. " $(1) $(<) $(@) font_uismall UINT8" }},
+ }
+end
+
custombuildtask {
- { MAME_DIR .. "scripts/font/NotoSans-Bold.bdc", GEN_DIR .. "emu/uismall.fh", { MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting NotoSans-Bold.bdc...", PYTHON .. " $(1) $(<) $(@) font_uismall UINT8" }},
{ MAME_DIR .. "src/emu/ui/uicmd14.png" , GEN_DIR .. "emu/ui/uicmd14.fh", { MAME_DIR.. "scripts/build/png2bdc.py", MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting uicmd14.png...", PYTHON .. " $(1) $(<) temp_cmd.bdc", PYTHON .. " $(2) temp_cmd.bdc $(@) font_uicmd14 UINT8" }},
layoutbuildtask("emu/layout", "dualhovu"),
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index fbc923b3073..0b38879b20c 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -2724,3 +2724,15 @@ if (MACHINES["PDC"]~=null) then
MAME_DIR .. "src/devices/machine/pdc.h",
}
end
+
+---------------------------------------------------
+--
+--@src/devices/machine/genpc.h,MACHINES["GENPC"] = true
+---------------------------------------------------
+
+if (MACHINES["GENPC"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/genpc.cpp",
+ MAME_DIR .. "src/devices/machine/genpc.h",
+ }
+end
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index eafcc59f72e..c9c99a354c3 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -137,11 +137,6 @@ end
links {
"qtdbg_" .. _OPTIONS["osd"],
}
- if (_OPTIONS["SOURCES"] == nil) then
- links {
- "bus",
- }
- end
links {
"netlist",
"optional",
@@ -165,7 +160,6 @@ end
if _OPTIONS["USE_LIBUV"]=="1" then
links {
- "luv",
"uv",
"http-parser",
}
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 54443d4f618..5cef56772a3 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -89,6 +89,7 @@ function osdmodulesbuild()
if _OPTIONS["targetos"]=="windows" then
includedirs {
MAME_DIR .. "3rdparty/winpcap/Include",
+ MAME_DIR .. "3rdparty/compat/mingw",
}
end
@@ -432,29 +433,6 @@ newoption {
}
newoption {
- trigger = "USE_XAUDIO2",
- description = "Use XAudio2 API for audio",
- allowed = {
- { "0", "Disable XAudio2" },
- { "1", "Enable XAudio2" },
- },
-}
-
-if _OPTIONS["USE_XAUDIO2"]=="1" then
- _OPTIONS["MODERN_WIN_API"] = "1",
- defines {
- "USE_XAUDIO2=1",
- },
- includedirs {
- MAME_DIR .. "3rdparty/win81sdk/Include/um",
- }
-else
- defines {
- "USE_XAUDIO2=0",
- }
-end
-
-newoption {
trigger = "USE_QTDEBUG",
description = "Use QT debugger",
allowed = {
diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua
index cc794ae88df..52a28147c32 100644
--- a/scripts/src/osd/osdmini.lua
+++ b/scripts/src/osd/osdmini.lua
@@ -65,6 +65,7 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/lib/osdobj_common.h",
MAME_DIR .. "src/osd/modules/font/font_sdl.cpp",
MAME_DIR .. "src/osd/modules/font/font_windows.cpp",
+ MAME_DIR .. "src/osd/modules/font/font_dwrite.cpp",
MAME_DIR .. "src/osd/modules/font/font_osx.cpp",
MAME_DIR .. "src/osd/modules/font/font_none.cpp",
MAME_DIR .. "src/osd/modules/netdev/taptun.cpp",
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index 877d1503915..80360ac2ecb 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -46,6 +46,7 @@ function maintargetosdoptions(_target,_subtarget)
"comctl32",
"comdlg32",
"psapi",
+ "ole32",
}
end
@@ -216,6 +217,7 @@ project ("ocore_" .. _OPTIONS["osd"])
dofile("windows_cfg.lua")
includedirs {
+ MAME_DIR .. "3rdparty",
MAME_DIR .. "src/emu",
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib",
diff --git a/scripts/src/tests.lua b/scripts/src/tests.lua
index d30cff64df2..baba88df28c 100644
--- a/scripts/src/tests.lua
+++ b/scripts/src/tests.lua
@@ -22,11 +22,6 @@ project "gtest"
"-Wno-unused-variable",
}
- configuration { "mingw-clang" }
- buildoptions {
- "-O0", -- crash of compiler when doing optimization
- }
-
configuration { "vs*" }
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index 421f5cc76b5..af134d0e77a 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -48,6 +48,7 @@ includedirs {
files {
MAME_DIR .. "src/tools/romcmp.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -108,6 +109,7 @@ includedirs {
files {
MAME_DIR .. "src/tools/chdman.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
MAME_DIR .. "src/version.cpp",
}
@@ -157,6 +159,7 @@ includedirs {
files {
MAME_DIR .. "src/tools/jedutil.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -280,6 +283,7 @@ includedirs {
files {
MAME_DIR .. "src/tools/ldresample.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -340,6 +344,7 @@ includedirs {
files {
MAME_DIR .. "src/tools/ldverify.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -388,6 +393,7 @@ includedirs {
files {
MAME_DIR .. "src/tools/regrep.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -436,6 +442,7 @@ includedirs {
files {
MAME_DIR .. "src/tools/srcclean.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -484,6 +491,7 @@ includedirs {
files {
MAME_DIR .. "src/tools/src2html.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -543,6 +551,7 @@ includedirs {
files {
MAME_DIR .. "src/tools/split.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -591,6 +600,7 @@ includedirs {
files {
MAME_DIR .. "src/tools/pngcmp.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -652,6 +662,7 @@ includedirs {
files {
MAME_DIR .. "src/lib/netlist/prg/nltool.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -690,7 +701,8 @@ includedirs {
}
files {
- MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp",
+ MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -752,6 +764,7 @@ includedirs {
files {
MAME_DIR .. "src/tools/castool.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -814,6 +827,7 @@ includedirs {
files {
MAME_DIR .. "src/tools/floptool.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index b84d17d69d5..17f8df2f760 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -563,6 +563,7 @@ MACHINES["STEPPERS"] = true
--MACHINES["DIABLO_HD"] = true
MACHINES["PCI9050"] = true
--MACHINES["TMS1024"] = true
+MACHINES["GENPC"] = true
--------------------------------------------------
-- specify available bus cores
@@ -619,7 +620,7 @@ BUSES["NEOGEO"] = true
--BUSES["ORICEXT"] = true
--BUSES["PCE"] = true
BUSES["PC_JOY"] = true
---BUSES["PC_KBD"] = true
+BUSES["PC_KBD"] = true
--BUSES["PET"] = true
--BUSES["PLUS4"] = true
--BUSES["PSX_CONTROLLER"] = true
@@ -2590,8 +2591,6 @@ files {
MAME_DIR .. "src/mame/includes/tceptor.h",
MAME_DIR .. "src/mame/video/tceptor.cpp",
MAME_DIR .. "src/mame/drivers/toypop.cpp",
- MAME_DIR .. "src/mame/includes/toypop.h",
- MAME_DIR .. "src/mame/video/toypop.cpp",
MAME_DIR .. "src/mame/drivers/turrett.cpp",
MAME_DIR .. "src/mame/includes/turrett.h",
MAME_DIR .. "src/mame/audio/turrett.cpp",
@@ -2823,11 +2822,7 @@ files {
MAME_DIR .. "src/mame/includes/battlex.h",
MAME_DIR .. "src/mame/video/battlex.cpp",
MAME_DIR .. "src/mame/drivers/carjmbre.cpp",
- MAME_DIR .. "src/mame/includes/carjmbre.h",
- MAME_DIR .. "src/mame/video/carjmbre.cpp",
MAME_DIR .. "src/mame/drivers/popper.cpp",
- MAME_DIR .. "src/mame/includes/popper.h",
- MAME_DIR .. "src/mame/video/popper.cpp",
MAME_DIR .. "src/mame/drivers/spaceg.cpp",
}
@@ -4293,9 +4288,6 @@ files {
MAME_DIR .. "src/mame/drivers/fireball.cpp",
MAME_DIR .. "src/mame/drivers/flipjack.cpp",
MAME_DIR .. "src/mame/drivers/flower.cpp",
- MAME_DIR .. "src/mame/includes/flower.h",
- MAME_DIR .. "src/mame/audio/flower.cpp",
- MAME_DIR .. "src/mame/video/flower.cpp",
MAME_DIR .. "src/mame/drivers/fortecar.cpp",
MAME_DIR .. "src/mame/drivers/fresh.cpp",
MAME_DIR .. "src/mame/drivers/freekick.cpp",
@@ -4481,8 +4473,6 @@ files {
MAME_DIR .. "src/mame/drivers/splus.cpp",
MAME_DIR .. "src/mame/drivers/spool99.cpp",
MAME_DIR .. "src/mame/drivers/sprcros2.cpp",
- MAME_DIR .. "src/mame/includes/sprcros2.h",
- MAME_DIR .. "src/mame/video/sprcros2.cpp",
MAME_DIR .. "src/mame/drivers/sshot.cpp",
MAME_DIR .. "src/mame/drivers/ssingles.cpp",
MAME_DIR .. "src/mame/drivers/sstrangr.cpp",
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 6c0dd4b0894..829c82af577 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -571,6 +571,7 @@ MACHINES["DIABLO_HD"] = true
MACHINES["TMS1024"] = true
MACHINES["NSC810"] = true
MACHINES["VT82C496"] = true
+MACHINES["GENPC"] = true
--------------------------------------------------
-- specify available bus cores
@@ -1777,8 +1778,6 @@ files {
MAME_DIR .. "src/mame/drivers/mephisto.cpp",
MAME_DIR .. "src/mame/drivers/mmodular.cpp",
MAME_DIR .. "src/mame/drivers/stratos.cpp",
- MAME_DIR .. "src/mame/machine/mboard.cpp",
- MAME_DIR .. "src/mame/includes/mboard.h",
}
createMESSProjects(_target, _subtarget, "hitachi")
@@ -2172,10 +2171,10 @@ createMESSProjects(_target, _subtarget, "novag")
files {
MAME_DIR .. "src/mame/drivers/mk1.cpp",
MAME_DIR .. "src/mame/drivers/mk2.cpp",
+ MAME_DIR .. "src/mame/drivers/novag6502.cpp",
MAME_DIR .. "src/mame/drivers/ssystem3.cpp",
MAME_DIR .. "src/mame/includes/ssystem3.h",
MAME_DIR .. "src/mame/video/ssystem3.cpp",
- MAME_DIR .. "src/mame/drivers/supercon.cpp",
}
createMESSProjects(_target, _subtarget, "olivetti")
@@ -2257,8 +2256,6 @@ files {
MAME_DIR .. "src/mame/drivers/asst128.cpp",
MAME_DIR .. "src/mame/drivers/europc.cpp",
MAME_DIR .. "src/mame/drivers/genpc.cpp",
- MAME_DIR .. "src/mame/includes/genpc.h",
- MAME_DIR .. "src/mame/machine/genpc.cpp",
MAME_DIR .. "src/mame/drivers/ibmpc.cpp",
MAME_DIR .. "src/mame/drivers/ibmpcjr.cpp",
MAME_DIR .. "src/mame/drivers/pc.cpp",
@@ -2605,8 +2602,6 @@ files {
createMESSProjects(_target, _subtarget, "svi")
files {
MAME_DIR .. "src/mame/drivers/svi318.cpp",
- MAME_DIR .. "src/mame/includes/svi318.h",
- MAME_DIR .. "src/mame/machine/svi318.cpp",
}
createMESSProjects(_target, _subtarget, "svision")
@@ -2996,9 +2991,6 @@ files {
MAME_DIR .. "src/mame/includes/mc1502.h",
MAME_DIR .. "src/mame/drivers/poisk1.cpp",
MAME_DIR .. "src/mame/machine/kb_poisk1.h",
- MAME_DIR .. "src/mame/includes/poisk1.h",
- MAME_DIR .. "src/mame/video/poisk1.cpp",
- MAME_DIR .. "src/mame/video/poisk1.h",
}
createMESSProjects(_target, _subtarget, "yamaha")
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 5cca681cdff..0181f14616f 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -107,8 +107,8 @@ function toolchain(_buildDir, _subDir)
print("Set ANDROID_NDK_ARM and ANDROID_NDK_ROOT envrionment variables.")
end
- premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm-3.6/prebuilt/windows-x86_64/bin/clang.exe"
- premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm-3.6/prebuilt/windows-x86_64/bin/clang++.exe"
+ 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")
@@ -120,8 +120,8 @@ function toolchain(_buildDir, _subDir)
print("Set ANDROID_NDK_ARM64 and ANDROID_NDK_ROOT envrionment variables.")
end
- premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm-3.6/prebuilt/windows-x86_64/bin/clang.exe"
- premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm-3.6/prebuilt/windows-x86_64/bin/clang++.exe"
+ 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")
@@ -133,8 +133,8 @@ function toolchain(_buildDir, _subDir)
print("Set ANDROID_NDK_MIPS and ANDROID_NDK_ROOT envrionment variables.")
end
- premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm-3.6/prebuilt/windows-x86_64/bin/clang.exe"
- premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm-3.6/prebuilt/windows-x86_64/bin/clang++.exe"
+ 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")
@@ -146,8 +146,8 @@ function toolchain(_buildDir, _subDir)
print("Set ANDROID_NDK_MIPS64 and ANDROID_NDK_ROOT envrionment variables.")
end
- premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm-3.6/prebuilt/windows-x86_64/bin/clang.exe"
- premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm-3.6/prebuilt/windows-x86_64/bin/clang++.exe"
+ 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")
@@ -159,8 +159,8 @@ function toolchain(_buildDir, _subDir)
print("Set ANDROID_NDK_X86 and ANDROID_NDK_ROOT envrionment variables.")
end
- premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm-3.6/prebuilt/windows-x86_64/bin/clang.exe"
- premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm-3.6/prebuilt/windows-x86_64/bin/clang++.exe"
+ 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.llvm = true
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-x86")
@@ -172,8 +172,8 @@ function toolchain(_buildDir, _subDir)
print("Set ANDROID_NDK_X64 and ANDROID_NDK_ROOT envrionment variables.")
end
- premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm-3.6/prebuilt/windows-x86_64/bin/clang.exe"
- premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm-3.6/prebuilt/windows-x86_64/bin/clang++.exe"
+ 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")
@@ -685,6 +685,8 @@ function toolchain(_buildDir, _subDir)
"-Wunused-value",
"-Wundef",
"-Wno-cast-align",
+ "-Wno-unknown-attributes",
+ "-Wno-macro-redefined",
}
linkoptions {
"-no-canonical-prefixes",