summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/src')
-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
10 files changed, 45 insertions, 134 deletions
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*" }