summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--scripts/extlib.lua36
-rw-r--r--scripts/genie.lua202
-rw-r--r--scripts/src/3rdparty.lua118
-rw-r--r--scripts/src/benchmarks.lua6
-rw-r--r--scripts/src/cpu.lua28
-rw-r--r--scripts/src/emu.lua2
-rw-r--r--scripts/src/main.lua56
-rw-r--r--scripts/src/netlist.lua6
-rw-r--r--scripts/src/osd/modules.lua22
-rw-r--r--scripts/src/osd/osdmini.lua12
-rw-r--r--scripts/src/osd/sdl.lua40
-rw-r--r--scripts/src/osd/sdl_cfg.lua34
-rw-r--r--scripts/src/osd/windows.lua6
-rw-r--r--scripts/src/sound.lua80
-rw-r--r--scripts/src/tests.lua8
-rw-r--r--scripts/src/tools.lua18
-rw-r--r--scripts/src/video.lua4
-rw-r--r--scripts/target/ldplayer/ldplayer.lua4
-rw-r--r--scripts/target/mame/arcade.lua2
-rw-r--r--scripts/target/mame/dummy.lua2
-rw-r--r--scripts/target/mame/mame.lua2
-rw-r--r--scripts/target/mame/mess.lua6
-rw-r--r--scripts/target/mame/nl.lua2
-rw-r--r--scripts/target/mame/tiny.lua2
-rw-r--r--scripts/toolchain.lua58
25 files changed, 378 insertions, 378 deletions
diff --git a/scripts/extlib.lua b/scripts/extlib.lua
index bd80c8b74b8..9d60fe1dc2e 100644
--- a/scripts/extlib.lua
+++ b/scripts/extlib.lua
@@ -19,48 +19,48 @@ local extlibs = {
-- system lib options
newoption {
- trigger = 'with-system-expat',
- description = 'Use system Expat library',
+ trigger = 'with-system-expat',
+ description = 'Use system Expat library',
}
newoption {
- trigger = 'with-system-zlib',
- description = 'Use system Zlib library',
+ trigger = 'with-system-zlib',
+ description = 'Use system Zlib library',
}
newoption {
- trigger = 'with-system-jpeg',
- description = 'Use system JPEG library',
+ trigger = 'with-system-jpeg',
+ description = 'Use system JPEG library',
}
newoption {
- trigger = 'with-system-flac',
- description = 'Use system FLAC library',
+ trigger = 'with-system-flac',
+ description = 'Use system FLAC library',
}
newoption {
- trigger = 'with-system-sqlite3',
- description = 'Use system SQLite library',
+ trigger = 'with-system-sqlite3',
+ description = 'Use system SQLite library',
}
newoption {
- trigger = 'with-system-portmidi',
- description = 'Use system PortMidi library',
+ trigger = 'with-system-portmidi',
+ description = 'Use system PortMidi library',
}
newoption {
- trigger = 'with-system-portaudio',
- description = 'Use system PortAudio library',
+ trigger = 'with-system-portaudio',
+ description = 'Use system PortAudio library',
}
newoption {
- trigger = "with-system-lua",
- description = "Use system LUA library",
+ trigger = "with-system-lua",
+ description = "Use system LUA library",
}
newoption {
- trigger = 'with-system-uv',
- description = 'Use system uv library',
+ trigger = 'with-system-uv',
+ description = 'Use system uv library',
}
-- build helpers
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 88af2217c8f..61617630d06 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -2,8 +2,8 @@
-- copyright-holders:MAMEdev Team
newoption {
- trigger = 'build-dir',
- description = 'Build directory name',
+ trigger = 'build-dir',
+ description = 'Build directory name',
}
premake.check_paths = true
@@ -32,23 +32,23 @@ function str_to_version(str)
val = val + tonumber(word) * cnt
cnt = cnt / 100
end
- return val
+ return val
end
function findfunction(x)
- assert(type(x) == "string")
- local f=_G
- for v in x:gmatch("[^%.]+") do
- if type(f) ~= "table" then
- return nil, "looking for '"..v.."' expected table, not "..type(f)
- end
- f=f[v]
- end
- if type(f) == "function" then
- return f
- else
- return nil, "expected function, not "..type(f)
- end
+ assert(type(x) == "string")
+ local f=_G
+ for v in x:gmatch("[^%.]+") do
+ if type(f) ~= "table" then
+ return nil, "looking for '"..v.."' expected table, not "..type(f)
+ end
+ f=f[v]
+ end
+ if type(f) == "function" then
+ return f
+ else
+ return nil, "expected function, not "..type(f)
+ end
end
function layoutbuildtask(_folder, _name)
@@ -57,9 +57,9 @@ function layoutbuildtask(_folder, _name)
end
function precompiledheaders()
- configuration { "not xcode4" }
- pchheader("emu.h")
- configuration { }
+ configuration { "not xcode4" }
+ pchheader("emu.h")
+ configuration { }
end
function addprojectflags()
@@ -101,13 +101,13 @@ newoption {
trigger = "targetos",
description = "Choose target OS",
allowed = {
- { "android", "Android" },
+ { "android", "Android" },
{ "asmjs", "Emscripten/asm.js" },
{ "freebsd", "FreeBSD" },
{ "netbsd", "NetBSD" },
{ "openbsd", "OpenBSD" },
{ "pnacl", "Native Client - PNaCl" },
- { "linux", "Linux" },
+ { "linux", "Linux" },
{ "ios", "iOS" },
{ "macosx", "OSX" },
{ "windows", "Windows" },
@@ -120,15 +120,15 @@ newoption {
}
newoption {
- trigger = 'with-bundled-sdl2',
- description = 'Build bundled SDL2 library',
+ trigger = 'with-bundled-sdl2',
+ description = 'Build bundled SDL2 library',
}
newoption {
trigger = "distro",
description = "Choose distribution",
allowed = {
- { "generic", "generic" },
+ { "generic", "generic" },
{ "debian-stable", "debian-stable" },
{ "ubuntu-intrepid", "ubuntu-intrepid" },
},
@@ -246,7 +246,7 @@ newoption {
trigger = "DEPRECATED",
description = "Generate deprecation warnings during compilation.",
allowed = {
- { "0", "Disabled" },
+ { "0", "Disabled" },
{ "1", "Enabled" },
}
}
@@ -255,7 +255,7 @@ newoption {
trigger = "LTO",
description = "Clang link time optimization.",
allowed = {
- { "0", "Disabled" },
+ { "0", "Disabled" },
{ "1", "Enabled" },
}
}
@@ -264,7 +264,7 @@ newoption {
trigger = "SSE2",
description = "SSE2 optimized code and SSE2 code generation.",
allowed = {
- { "0", "Disabled" },
+ { "0", "Disabled" },
{ "1", "Enabled" },
}
}
@@ -273,7 +273,7 @@ newoption {
trigger = "SSE3",
description = "SSE3 optimized code and SSE3 code generation.",
allowed = {
- { "0", "Disabled" },
+ { "0", "Disabled" },
{ "1", "Enabled" },
}
}
@@ -282,7 +282,7 @@ newoption {
trigger = "OPENMP",
description = "OpenMP optimized code.",
allowed = {
- { "0", "Disabled" },
+ { "0", "Disabled" },
{ "1", "Enabled" },
}
}
@@ -291,7 +291,7 @@ newoption {
trigger = "FASTDEBUG",
description = "Fast DEBUG.",
allowed = {
- { "0", "Disabled" },
+ { "0", "Disabled" },
{ "1", "Enabled" },
}
}
@@ -300,7 +300,7 @@ newoption {
trigger = "SEPARATE_BIN",
description = "Use separate bin folders.",
allowed = {
- { "0", "Disabled" },
+ { "0", "Disabled" },
{ "1", "Enabled" },
}
}
@@ -314,7 +314,7 @@ newoption {
trigger = "SHADOW_CHECK",
description = "Shadow checks.",
allowed = {
- { "0", "Disabled" },
+ { "0", "Disabled" },
{ "1", "Enabled" },
}
}
@@ -323,7 +323,7 @@ newoption {
trigger = "STRIP_SYMBOLS",
description = "Symbols stripping.",
allowed = {
- { "0", "Disabled" },
+ { "0", "Disabled" },
{ "1", "Enabled" },
}
}
@@ -333,7 +333,7 @@ newoption {
trigger = "SHLIB",
description = "Generate shared libs.",
allowed = {
- { "0", "Static libs" },
+ { "0", "Static libs" },
{ "1", "Shared libs" },
}
}
@@ -347,7 +347,7 @@ newoption {
trigger = "FORCE_VERSION_COMPILE",
description = "Force compiling of version.c file.",
allowed = {
- { "0", "Disabled" },
+ { "0", "Disabled" },
{ "1", "Enabled" },
}
}
@@ -361,7 +361,7 @@ newoption {
trigger = "USE_LIBUV",
description = "Use libuv.",
allowed = {
- { "0", "Disabled" },
+ { "0", "Disabled" },
{ "1", "Enabled" },
}
}
@@ -426,15 +426,15 @@ configurations {
}
if _ACTION == "xcode4" then
- platforms {
- "x64",
- }
+ platforms {
+ "x64",
+ }
else
- platforms {
- "x32",
- "x64",
- "Native", -- for targets where bitness is not specified
- }
+ platforms {
+ "x32",
+ "x64",
+ "Native", -- for targets where bitness is not specified
+ }
end
language "C++"
@@ -476,7 +476,7 @@ end
if _OPTIONS["targetos"] == "android" then
_OPTIONS["with-bundled-sdl2"] = "1"
end
-
+
configuration {}
msgcompile ("Compiling $(subst ../,,$<)...")
@@ -789,7 +789,7 @@ if _OPTIONS["OPTIMIZE"] then
-- windows native mingw GCC 5.2 fails with -flto=x with x > 1. bug unfixed as of this commit
"-flto=1",
-- if ld fails, just buy more RAM or uncomment this!
--- "-Wl,-no-keep-memory",
+-- "-Wl,-no-keep-memory",
"-Wl,-v",
-- silence redefine warnings from discrete.c.
"-Wl,-allow-multiple-definition",
@@ -801,17 +801,17 @@ if _OPTIONS["OPTIMIZE"] then
"-flto-odr-type-merging",
"-Wodr",
"-flto-compression-level=0", -- lto doesn't work with anything <9 on linux with < 12G RAM, much slower if <> 0
--- "-flto-report", -- if you get an error in lto after [WPA] stage, but before [LTRANS] stage, you need more memory!
--- "-fmem-report-wpa","-fmem-report","-fpre-ipa-mem-report","-fpost-ipa-mem-report","-flto-report-wpa","-fmem-report",
+-- "-flto-report", -- if you get an error in lto after [WPA] stage, but before [LTRANS] stage, you need more memory!
+-- "-fmem-report-wpa","-fmem-report","-fpre-ipa-mem-report","-fpost-ipa-mem-report","-flto-report-wpa","-fmem-report",
-- this six flag combo lets MAME compile with LTO=1 on linux with no errors and ~2% speed boost, but compile time is much longer
-- if you are going to wait on lto, you might as well enable these for GCC
--- "-fdevirtualize-at-ltrans","-fgcse-sm","-fgcse-las",
--- "-fipa-pta","-fipa-icf","-fvariable-expansion-in-unroller",
+-- "-fdevirtualize-at-ltrans","-fgcse-sm","-fgcse-las",
+-- "-fipa-pta","-fipa-icf","-fvariable-expansion-in-unroller",
}
-- same flags are needed by linker
linkoptions {
"-flto=1",
--- "-Wl,-no-keep-memory",
+-- "-Wl,-no-keep-memory",
"-Wl,-v",
"-Wl,-allow-multiple-definition",
"-fuse-linker-plugin",
@@ -819,12 +819,12 @@ if _OPTIONS["OPTIMIZE"] then
"-flto-odr-type-merging",
"-Wodr",
"-flto-compression-level=0", -- lto doesn't work with anything <9 on linux with < 12G RAM, much slower if <> 0
--- "-flto-report", -- if you get an error in lto after [WPA] stage, but before [LTRANS] stage, you need more memory!
--- "-fmem-report-wpa","-fmem-report","-fpre-ipa-mem-report","-fpost-ipa-mem-report","-flto-report-wpa","-fmem-report",
+-- "-flto-report", -- if you get an error in lto after [WPA] stage, but before [LTRANS] stage, you need more memory!
+-- "-fmem-report-wpa","-fmem-report","-fpre-ipa-mem-report","-fpost-ipa-mem-report","-flto-report-wpa","-fmem-report",
-- this six flag combo lets MAME compile with LTO=1 on linux with no errors and ~2% speed boost, but compile time is much longer
-- if you are going to wait on lto, you might as well enable these for GCC
--- "-fdevirtualize-at-ltrans","-fgcse-sm","-fgcse-las",
--- "-fipa-pta","-fipa-icf","-fvariable-expansion-in-unroller",
+-- "-fdevirtualize-at-ltrans","-fgcse-sm","-fgcse-las",
+-- "-fipa-pta","-fipa-icf","-fvariable-expansion-in-unroller",
}
@@ -971,7 +971,7 @@ end
}
end
end
-
+
if (_OPTIONS["PLATFORM"]=="arm") then
buildoptions {
"-Wno-cast-align",
@@ -982,7 +982,7 @@ if (_OPTIONS["PLATFORM"]=="arm64") then
buildoptions {
"-Wno-cast-align",
}
- defines {
+ defines {
"PTR64=1",
}
end
@@ -1029,7 +1029,7 @@ configuration { "android-arm64" }
buildoptions {
"-Wno-asm-operand-widths",
}
-
+
configuration { "pnacl" }
buildoptions {
"-std=gnu89",
@@ -1058,17 +1058,17 @@ configuration { "linux-* or rpi or ci20"}
configuration { "steamlink" }
links {
"dl",
- "EGL",
+ "EGL",
"GLESv2",
- "SDL2",
- }
+ "SDL2",
+ }
defines {
"EGL_API_FB",
}
configuration { "rpi" }
links {
- "SDL2",
+ "SDL2",
"fontconfig",
"X11",
"GLESv2",
@@ -1077,17 +1077,17 @@ configuration { "rpi" }
"vcos",
"vchiq_arm",
"pthread",
- }
+ }
configuration { "ci20" }
links {
- "SDL2",
+ "SDL2",
"asound",
"fontconfig",
"freetype",
"pthread",
- }
+ }
configuration { "osx* or xcode4" }
@@ -1117,7 +1117,7 @@ configuration { "mingw-clang" }
linkoptions {
"-pthread",
}
-
+
configuration { "vs*" }
defines {
@@ -1141,7 +1141,7 @@ configuration { "vs*" }
}
buildoptions {
- "/WX", -- Treats all compiler warnings as errors.
+ "/WX", -- Treats all compiler warnings as errors.
"/wd4025", -- warning C4025: 'number' : based pointer passed to function with variable arguments: parameter number
"/wd4003", -- warning C4003: not enough actual parameters for macro 'xxx'
"/wd4018", -- warning C4018: 'x' : signed/unsigned mismatch
@@ -1205,38 +1205,38 @@ configuration { "vs*" }
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd9", -- remark #9: nested comment is not allowed
- "/Qwd82", -- remark #82: storage class is not first
- "/Qwd111", -- remark #111: statement is unreachable
- "/Qwd128", -- remark #128: loop is not reachable
- "/Qwd177", -- remark #177: function "xxx" was declared but never referenced
- "/Qwd181", -- remark #181: argument of type "UINT32={unsigned int}" is incompatible with format "%d", expecting argument of type "int"
- "/Qwd185", -- remark #185: dynamic initialization in unreachable code
- "/Qwd280", -- remark #280: selector expression is constant
- "/Qwd344", -- remark #344: typedef name has already been declared (with same type)
- "/Qwd411", -- remark #411: class "xxx" defines no constructor to initialize the following
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
- "/Qwd2545", -- remark #2545: empty dependent statement in "else" clause of if - statement
- "/Qwd2553", -- remark #2553: nonstandard second parameter "TCHAR={WCHAR = { __wchar_t } } **" of "main", expected "char *[]" or "char **" extern "C" int _tmain(int argc, TCHAR **argv)
- "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
- "/Qwd3280", -- remark #3280: declaration hides member "attotime::seconds" (declared at line 126) static attotime from_seconds(INT32 seconds) { return attotime(seconds, 0); }
-
- "/Qwd170", -- error #170: pointer points outside of underlying object
- "/Qwd188", -- error #188: enumerated type mixed with another type
-
- "/Qwd63", -- warning #63: shift count is too large
- "/Qwd177", -- warning #177: label "xxx" was declared but never referenced
- "/Qwd186", -- warning #186: pointless comparison of unsigned integer with zero
- "/Qwd488", -- warning #488: template parameter "_FunctionClass" is not used in declaring the parameter types of function template "device_delegate<_Signature>::device_delegate<_FunctionClass>(delegate<_Signature>:
- "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated
- "/Qwd1879", -- warning #1879: unimplemented pragma ignored
- "/Qwd3291", -- warning #3291: invalid narrowing conversion from "double" to "int"
- "/Qwd1195", -- error #1195: conversion from integer to smaller pointer
- "/Qwd47", -- error #47: incompatible redefinition of macro "xxx"
- "/Qwd265", -- error #265: floating-point operation result is out of range
+ "/Qwd9", -- remark #9: nested comment is not allowed
+ "/Qwd82", -- remark #82: storage class is not first
+ "/Qwd111", -- remark #111: statement is unreachable
+ "/Qwd128", -- remark #128: loop is not reachable
+ "/Qwd177", -- remark #177: function "xxx" was declared but never referenced
+ "/Qwd181", -- remark #181: argument of type "UINT32={unsigned int}" is incompatible with format "%d", expecting argument of type "int"
+ "/Qwd185", -- remark #185: dynamic initialization in unreachable code
+ "/Qwd280", -- remark #280: selector expression is constant
+ "/Qwd344", -- remark #344: typedef name has already been declared (with same type)
+ "/Qwd411", -- remark #411: class "xxx" defines no constructor to initialize the following
+ "/Qwd869", -- remark #869: parameter "xxx" was never referenced
+ "/Qwd2545", -- remark #2545: empty dependent statement in "else" clause of if - statement
+ "/Qwd2553", -- remark #2553: nonstandard second parameter "TCHAR={WCHAR = { __wchar_t } } **" of "main", expected "char *[]" or "char **" extern "C" int _tmain(int argc, TCHAR **argv)
+ "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
+ "/Qwd3280", -- remark #3280: declaration hides member "attotime::seconds" (declared at line 126) static attotime from_seconds(INT32 seconds) { return attotime(seconds, 0); }
+
+ "/Qwd170", -- error #170: pointer points outside of underlying object
+ "/Qwd188", -- error #188: enumerated type mixed with another type
+
+ "/Qwd63", -- warning #63: shift count is too large
+ "/Qwd177", -- warning #177: label "xxx" was declared but never referenced
+ "/Qwd186", -- warning #186: pointless comparison of unsigned integer with zero
+ "/Qwd488", -- warning #488: template parameter "_FunctionClass" is not used in declaring the parameter types of function template "device_delegate<_Signature>::device_delegate<_FunctionClass>(delegate<_Signature>:
+ "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated
+ "/Qwd1879", -- warning #1879: unimplemented pragma ignored
+ "/Qwd3291", -- warning #3291: invalid narrowing conversion from "double" to "int"
+ "/Qwd1195", -- error #1195: conversion from integer to smaller pointer
+ "/Qwd47", -- error #47: incompatible redefinition of macro "xxx"
+ "/Qwd265", -- error #265: floating-point operation result is out of range
-- these occur on a release build, while we can increase the size limits instead some of the files do require extreme amounts
- "/Qwd11074", -- remark #11074: Inlining inhibited by limit max-size / remark #11074: Inlining inhibited by limit max-total-size
- "/Qwd11075", -- remark #11075: To get full report use -Qopt-report:4 -Qopt-report-phase ipo
+ "/Qwd11074", -- remark #11074: Inlining inhibited by limit max-size / remark #11074: Inlining inhibited by limit max-total-size
+ "/Qwd11075", -- remark #11075: To get full report use -Qopt-report:4 -Qopt-report-phase ipo
}
end
@@ -1248,7 +1248,7 @@ end
}
configuration { "vs2015" }
buildoptions {
- "/wd4334", -- warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)
+ "/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
"/wd4457", -- warning C4457: declaration of 'xxx' hides function parameter
"/wd4458", -- warning C4458: declaration of 'xxx' hides class member
@@ -1308,7 +1308,7 @@ findfunction("createProjects_" .. _OPTIONS["target"] .. "_" .. _OPTIONS["subtarg
group "emulator"
dofile(path.join("src", "main.lua"))
-if (_OPTIONS["SOURCES"] == nil) then
+if (_OPTIONS["SOURCES"] == nil) then
if (_OPTIONS["target"] == _OPTIONS["subtarget"]) then
startproject (_OPTIONS["target"])
else
@@ -1320,7 +1320,7 @@ if (_OPTIONS["SOURCES"] == nil) then
end
else
startproject (_OPTIONS["subtarget"])
-end
+end
mainProject(_OPTIONS["target"],_OPTIONS["subtarget"])
strip()
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index dd3481f8ae5..30cb3770a4a 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -26,10 +26,10 @@ project "expat"
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd111", -- remark #111: statement is unreachable
- "/Qwd1879", -- warning #1879: unimplemented pragma ignored
- "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
+ "/Qwd111", -- remark #111: statement is unreachable
+ "/Qwd1879", -- warning #1879: unimplemented pragma ignored
+ "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
+ "/Qwd869", -- remark #869: parameter "xxx" was never referenced
}
end
configuration { "vs2015" }
@@ -76,8 +76,8 @@ project "zlib"
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd111", -- remark #111: statement is unreachable
- "/Qwd280", -- remark #280: selector expression is constant
+ "/Qwd111", -- remark #111: statement is unreachable
+ "/Qwd280", -- remark #280: selector expression is constant
}
end
configuration "Debug"
@@ -137,7 +137,7 @@ project "softfloat"
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
+ "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
}
end
configuration { }
@@ -165,7 +165,7 @@ project "jpeg"
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
+ "/Qwd869", -- remark #869: parameter "xxx" was never referenced
}
end
@@ -243,11 +243,11 @@ project "flac"
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd111", -- remark #111: statement is unreachable
- "/Qwd177", -- remark #177: function "xxx" was declared but never referenced
- "/Qwd181", -- remark #181: argument of type "UINT32={unsigned int}" is incompatible with format "%d", expecting argument of type "int"
- "/Qwd188", -- error #188: enumerated type mixed with another type
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
+ "/Qwd111", -- remark #111: statement is unreachable
+ "/Qwd177", -- remark #177: function "xxx" was declared but never referenced
+ "/Qwd181", -- remark #181: argument of type "UINT32={unsigned int}" is incompatible with format "%d", expecting argument of type "int"
+ "/Qwd188", -- error #188: enumerated type mixed with another type
+ "/Qwd869", -- remark #869: parameter "xxx" was never referenced
}
end
@@ -330,7 +330,7 @@ project "7z"
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
+ "/Qwd869", -- remark #869: parameter "xxx" was never referenced
}
end
configuration { "vs2015" }
@@ -381,7 +381,7 @@ project "lua"
-- In addition comment out the "extern "C""
-- in lua.hpp and do the same in luaengine.c line 47
--options {
- -- "ForceCPP",
+ -- "ForceCPP",
--}
configuration { "gmake" }
@@ -524,8 +524,8 @@ project "sqlite3"
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
- "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
+ "/Qwd869", -- remark #869: parameter "xxx" was never referenced
+ "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
}
end
configuration { "pnacl" }
@@ -587,10 +587,10 @@ project "portmidi"
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd188", -- error #188: enumerated type mixed with another type
- "/Qwd344", -- remark #344: typedef name has already been declared (with same type)
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
- "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
+ "/Qwd188", -- error #188: enumerated type mixed with another type
+ "/Qwd344", -- remark #344: typedef name has already been declared (with same type)
+ "/Qwd869", -- remark #869: parameter "xxx" was never referenced
+ "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
}
end
@@ -668,9 +668,9 @@ project "bgfx"
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd906", -- message #906: effect of this "#pragma pack" directive is local to function "xxx"
- "/Qwd1879", -- warning #1879: unimplemented pragma ignored
- "/Qwd82", -- remark #82: storage class is not first
+ "/Qwd906", -- message #906: effect of this "#pragma pack" directive is local to function "xxx"
+ "/Qwd1879", -- warning #1879: unimplemented pragma ignored
+ "/Qwd82", -- remark #82: storage class is not first
}
end
configuration { }
@@ -819,10 +819,10 @@ project "portaudio"
}
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
+ "/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" }
@@ -1021,7 +1021,7 @@ project "uv"
"WIN32_LEAN_AND_MEAN",
"_WIN32_WINNT=0x0502",
}
- if _ACTION == "vs2013" then
+ if _ACTION == "vs2013" then
files {
MAME_DIR .. "3rdparty/libuv/src/win/snprintf.c",
}
@@ -1106,7 +1106,7 @@ project "uv"
MAME_DIR .. "3rdparty/libuv/src/unix/proctitle.c",
}
end
-
+
if _OPTIONS["targetos"]=="android" then
defines {
"_GNU_SOURCE",
@@ -1124,7 +1124,7 @@ project "uv"
MAME_DIR .. "3rdparty/libuv/src/unix/android-ifaddrs.c",
}
end
-
+
if _OPTIONS["targetos"]=="solaris" then
defines {
"__EXTENSIONS__",
@@ -1177,7 +1177,7 @@ end
if _OPTIONS["with-bundled-sdl2"] then
project "SDL2"
uuid "caab3327-574f-4abf-b25b-74d5238ae59b"
-if _OPTIONS["targetos"]=="android" then
+if _OPTIONS["targetos"]=="android" then
kind "SharedLib"
targetextension ".so"
targetprefix "lib"
@@ -1189,8 +1189,8 @@ if _OPTIONS["targetos"]=="android" then
linkoptions {
"-Wl,-soname,liSDL2.so"
}
-
- if _OPTIONS["SEPARATE_BIN"]~="1" then
+
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
if _OPTIONS["PLATFORM"]=="arm" then
targetdir(MAME_DIR .. "android-project/app/src/main/libs/armeabi-v7a")
end
@@ -1209,11 +1209,11 @@ if _OPTIONS["targetos"]=="android" then
if _OPTIONS["PLATFORM"]=="x64" then
targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86_64")
end
- end
+ end
else
kind "StaticLib"
-end
-
+end
+
files {
MAME_DIR .. "3rdparty/SDL2/include/begin_code.h",
MAME_DIR .. "3rdparty/SDL2/include/close_code.h",
@@ -1287,8 +1287,8 @@ end
MAME_DIR .. "3rdparty/SDL2/include/SDL_types.h",
MAME_DIR .. "3rdparty/SDL2/include/SDL_version.h",
MAME_DIR .. "3rdparty/SDL2/include/SDL_video.h",
-
-
+
+
MAME_DIR .. "3rdparty/SDL2/src/atomic/SDL_atomic.c",
MAME_DIR .. "3rdparty/SDL2/src/atomic/SDL_spinlock.c",
MAME_DIR .. "3rdparty/SDL2/src/audio/disk/SDL_diskaudio.c",
@@ -1457,13 +1457,13 @@ end
MAME_DIR .. "3rdparty/SDL2/src/render/opengles/SDL_glesfuncs.h",
}
end
-
+
if _OPTIONS["targetos"]=="android" then
files {
MAME_DIR .. "3rdparty/SDL2/src/audio/android/SDL_androidaudio.c",
MAME_DIR .. "3rdparty/SDL2/src/audio/android/SDL_androidaudio.h",
- MAME_DIR .. "3rdparty/SDL2/src/core/android/SDL_android.c",
- MAME_DIR .. "3rdparty/SDL2/src/core/android/SDL_android.h",
+ MAME_DIR .. "3rdparty/SDL2/src/core/android/SDL_android.c",
+ MAME_DIR .. "3rdparty/SDL2/src/core/android/SDL_android.h",
MAME_DIR .. "3rdparty/SDL2/src/filesystem/android/SDL_sysfilesystem.c",
MAME_DIR .. "3rdparty/SDL2/src/haptic/dummy/SDL_syshaptic.c",
MAME_DIR .. "3rdparty/SDL2/src/joystick/android/SDL_sysjoystick.c",
@@ -1497,7 +1497,7 @@ end
MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidwindow.h",
}
end
-
+
if _OPTIONS["targetos"]=="macosx" then
files {
MAME_DIR .. "3rdparty/SDL2/src/audio/coreaudio/SDL_coreaudio.c",
@@ -1510,7 +1510,7 @@ end
MAME_DIR .. "3rdparty/SDL2/src/joystick/darwin/SDL_sysjoystick.c",
MAME_DIR .. "3rdparty/SDL2/src/joystick/darwin/SDL_sysjoystick_c.h",
MAME_DIR .. "3rdparty/SDL2/src/loadso/dlopen/SDL_sysloadso.c",
- MAME_DIR .. "3rdparty/SDL2/src/power/macosx/SDL_syspower.c",
+ MAME_DIR .. "3rdparty/SDL2/src/power/macosx/SDL_syspower.c",
MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_syscond.c",
MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_sysmutex.c",
MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_sysmutex_c.h",
@@ -1605,25 +1605,25 @@ end
MAME_DIR .. "3rdparty/SDL2/src/main/windows/version.rc",
}
end
-
+
configuration { "vs*" }
files {
MAME_DIR .. "3rdparty/SDL2/src/audio/xaudio2/SDL_xaudio2.c",
}
-
+
buildoptions {
"/wd4200", -- warning C4200: nonstandard extension used: zero-sized array in struct/union
"/wd4055", -- warning C4055: 'type cast': from data pointer 'void *' to function pointer 'xxx'
"/wd4152", -- warning C4152: nonstandard extension, function/data pointer conversion in expression
"/wd4057", -- warning C4057: 'function': 'xxx' differs in indirection to slightly different base types from 'xxx'
"/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used
- "/wd4204", -- warning C4204: nonstandard extension used: non-constant aggregate initializer
+ "/wd4204", -- warning C4204: nonstandard extension used: non-constant aggregate initializer
"/wd4054", -- warning C4054: 'type cast': from function pointer 'xxx' to data pointer 'xxx'
}
defines {
"HAVE_LIBC",
}
-
+
configuration { "mingw*"}
includedirs {
MAME_DIR .. "3rdparty/SDL2-override/mingw",
@@ -1635,21 +1635,21 @@ end
"-Wno-bad-function-cast",
"-Wno-discarded-qualifiers",
"-Wno-unused-but-set-variable",
- }
+ }
configuration { "osx*"}
buildoptions {
"-Wno-undef",
- }
- buildoptions_objc {
- "-x objective-c",
- "-std=c99",
- }
-
+ }
+ buildoptions_objc {
+ "-x objective-c",
+ "-std=c99",
+ }
+
buildoptions_c {
"-Wno-bad-function-cast",
- }
-
+ }
+
configuration { "android-*"}
defines {
"GL_GLEXT_PROTOTYPES",
@@ -1659,8 +1659,8 @@ end
"-Wno-incompatible-pointer-types-discards-qualifiers",
"-Wno-unneeded-internal-declaration",
"-Wno-unused-const-variable",
- }
-
+ }
+
configuration { }
includedirs {
MAME_DIR .. "3rdparty/SDL2/include",
diff --git a/scripts/src/benchmarks.lua b/scripts/src/benchmarks.lua
index f774e3f45ca..a643939d6db 100644
--- a/scripts/src/benchmarks.lua
+++ b/scripts/src/benchmarks.lua
@@ -45,13 +45,13 @@ project "benchmark"
project("benchmarks")
uuid ("a9750a48-d283-4a6d-b126-31c7ce049af1")
- kind "ConsoleApp"
+ kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
- if _OPTIONS["SEPARATE_BIN"]~="1" then
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 4d3f98a3e4c..113d3962110 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -35,7 +35,7 @@ if (CPUS["SH2"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RS
MAME_DIR .. "src/devices/cpu/drcbex64.cpp",
MAME_DIR .. "src/devices/cpu/drcbex64.h",
MAME_DIR .. "src/devices/cpu/drcumlsh.h",
- MAME_DIR .. "src/devices/cpu/x86emit.h",
+ MAME_DIR .. "src/devices/cpu/x86emit.h",
}
end
@@ -86,7 +86,7 @@ if (CPUS["ARCOMPACT"]~=null) then
MAME_DIR .. "src/devices/cpu/arcompact/arcompact_common.h",
}
dependency {
- { MAME_DIR .. "src/devices/cpu/arcompact/arcompact.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" },
+ { MAME_DIR .. "src/devices/cpu/arcompact/arcompact.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" },
{ MAME_DIR .. "src/devices/cpu/arcompact/arcompact_execute.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" },
}
@@ -577,7 +577,7 @@ if (CPUS["H8"]~=null) then
MAME_DIR .. "src/devices/cpu/h8/h8_sci.cpp",
MAME_DIR .. "src/devices/cpu/h8/h8_sci.h",
}
-
+
dependency {
{ MAME_DIR .. "src/devices/cpu/h8/h8.cpp", GEN_DIR .. "emu/cpu/h8/h8.inc" },
{ MAME_DIR .. "src/devices/cpu/h8/h8h.cpp", GEN_DIR .. "emu/cpu/h8/h8h.inc" },
@@ -950,7 +950,7 @@ end
if (CPUS["I960"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/i960/i960.cpp",
- MAME_DIR .. "src/devices/cpu/i960/i960.h",
+ MAME_DIR .. "src/devices/cpu/i960/i960.h",
}
end
@@ -1163,7 +1163,7 @@ if (CPUS["M37710"]~=null) then
MAME_DIR .. "src/devices/cpu/m37710/m37710cm.h",
MAME_DIR .. "src/devices/cpu/m37710/m37710il.h",
MAME_DIR .. "src/devices/cpu/m37710/m37710op.h",
- MAME_DIR .. "src/devices/cpu/m37710/m7700ds.h",
+ MAME_DIR .. "src/devices/cpu/m37710/m7700ds.h",
}
end
@@ -1233,7 +1233,7 @@ if (CPUS["M6502"]~=null) then
MAME_DIR .. "src/devices/cpu/m6502/m5074x.cpp",
MAME_DIR .. "src/devices/cpu/m6502/m5074x.h",
}
-
+
dependency {
{ MAME_DIR .. "src/devices/cpu/m6502/deco16.cpp", GEN_DIR .. "emu/cpu/m6502/deco16.inc" },
{ MAME_DIR .. "src/devices/cpu/m6502/m4510.cpp", GEN_DIR .. "emu/cpu/m6502/m4510.inc" },
@@ -1432,14 +1432,14 @@ end
--------------------------------------------------
if (CPUS["PATINHOFEIO"]~=null) then
- files {
- MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.cpp",
- MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.h",
- }
+ files {
+ MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.cpp",
+ MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.h",
+ }
end
if (CPUS["PATINHOFEIO"]~=null or _OPTIONS["with-tools"]) then
- table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio_dasm.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio_dasm.cpp")
end
--------------------------------------------------
@@ -1612,7 +1612,7 @@ if (CPUS["MINX"]~=null) then
MAME_DIR .. "src/devices/cpu/minx/minxfunc.h",
MAME_DIR .. "src/devices/cpu/minx/minxopce.h",
MAME_DIR .. "src/devices/cpu/minx/minxopcf.h",
- MAME_DIR .. "src/devices/cpu/minx/minxops.h",
+ MAME_DIR .. "src/devices/cpu/minx/minxops.h",
}
end
@@ -1696,7 +1696,7 @@ if (CPUS["SATURN"]~=null) then
MAME_DIR .. "src/devices/cpu/saturn/saturn.cpp",
MAME_DIR .. "src/devices/cpu/saturn/saturn.h",
MAME_DIR .. "src/devices/cpu/saturn/satops.inc",
- MAME_DIR .. "src/devices/cpu/saturn/sattable.inc",
+ MAME_DIR .. "src/devices/cpu/saturn/sattable.inc",
}
end
@@ -2043,7 +2043,7 @@ if (CPUS["TMS57002"]~=null) then
{ MAME_DIR .. "src/devices/cpu/tms57002/tms57kdec.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" },
{ MAME_DIR .. "src/devices/cpu/tms57002/tms57002.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" },
}
- custombuildtask {
+ custombuildtask {
{ MAME_DIR .. "src/devices/cpu/tms57002/tmsinstr.lst" , GEN_DIR .. "emu/cpu/tms57002/tms57002.inc", { MAME_DIR .. "src/devices/cpu/tms57002/tmsmake.py" }, {"@echo Generating TMS57002 source file...", PYTHON .. " $(1) $(<) $(@)" } }
}
end
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
index 56ff55879dd..efe30edbb1d 100644
--- a/scripts/src/emu.lua
+++ b/scripts/src/emu.lua
@@ -280,7 +280,7 @@ files {
MAME_DIR .. "src/emu/ui/starimg.h",
MAME_DIR .. "src/emu/ui/toolbar.h",
MAME_DIR .. "src/emu/ui/utils.cpp",
- MAME_DIR .. "src/emu/ui/utils.h",
+ MAME_DIR .. "src/emu/ui/utils.h",
MAME_DIR .. "src/emu/validity.cpp",
MAME_DIR .. "src/emu/validity.h",
MAME_DIR .. "src/emu/video.cpp",
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 52211bf92fe..af60a3ccc44 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -10,7 +10,7 @@
---------------------------------------------------------------------------
function mainProject(_target, _subtarget)
-if (_OPTIONS["SOURCES"] == nil) then
+if (_OPTIONS["SOURCES"] == nil) then
if (_target == _subtarget) then
project (_target)
else
@@ -19,13 +19,13 @@ if (_OPTIONS["SOURCES"] == nil) then
else
project (_target .. _subtarget)
end
- end
+ end
else
project (_subtarget)
-end
+end
uuid (os.uuid(_target .."_" .. _subtarget))
kind "ConsoleApp"
-
+
configuration { "android*" }
targetprefix "lib"
targetname "main"
@@ -39,7 +39,7 @@ end
"GLESv1_CM",
"GLESv2",
"SDL2",
- }
+ }
configuration { "pnacl" }
kind "ConsoleApp"
targetextension ".pexe"
@@ -53,7 +53,7 @@ end
addprojectflags()
flags {
"NoManifest",
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
if _OPTIONS["SYMBOLS"] then
@@ -63,7 +63,7 @@ end
"$(SILENT) objdump --section=.text --line-numbers --syms --demangle $(TARGET) >$(subst .exe,.sym,$(TARGET))"
}
end
-
+
configuration { "vs*" }
flags {
"Unicode",
@@ -112,7 +112,7 @@ end
targetextension ""
configuration { "asmjs" }
- targetextension ".bc"
+ targetextension ".bc"
if os.getenv("EMSCRIPTEN") then
local emccopts = ""
emccopts = emccopts .. " -O3"
@@ -141,12 +141,12 @@ end
includedirs {
MAME_DIR .. "3rdparty/SDL2/include",
}
-
+
files {
MAME_DIR .. "3rdparty/SDL2/src/main/android/SDL_android_main.c",
}
targetsuffix ""
- if _OPTIONS["SEPARATE_BIN"]~="1" then
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
if _OPTIONS["PLATFORM"]=="arm" then
targetdir(MAME_DIR .. "android-project/app/src/main/libs/armeabi-v7a")
end
@@ -167,11 +167,11 @@ end
end
end
else
- if _OPTIONS["SEPARATE_BIN"]~="1" then
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
end
-
+
findfunction("linkProjects_" .. _OPTIONS["target"] .. "_" .. _OPTIONS["subtarget"])(_OPTIONS["target"], _OPTIONS["subtarget"])
links {
"osd_" .. _OPTIONS["osd"],
@@ -201,7 +201,7 @@ end
}
if _OPTIONS["USE_LIBUV"]=="1" then
- links {
+ links {
ext_lib("uv"),
"http-parser",
}
@@ -221,9 +221,9 @@ end
"bgfx",
"ocore_" .. _OPTIONS["osd"],
}
-
+
override_resources = false;
-
+
maintargetosdoptions(_target,_subtarget)
includedirs {
@@ -273,7 +273,7 @@ end
dependency {
{ "$(OBJDIR)/mame.res" , GEN_DIR .. "resource/" .. rctarget .. "vers.rc", true },
}
- end
+ end
end
local mainfile = MAME_DIR .. "src/".._target .."/" .. _subtarget ..".cpp"
@@ -285,12 +285,12 @@ end
MAME_DIR .. "src/version.cpp",
GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp",
}
-
-if (_OPTIONS["SOURCES"] == nil) then
+
+if (_OPTIONS["SOURCES"] == nil) then
if os.isfile(MAME_DIR .. "src/".._target .."/" .. _subtarget ..".flt") then
dependency {
- {
+ {
GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true },
}
custombuildtask {
@@ -303,7 +303,7 @@ if (_OPTIONS["SOURCES"] == nil) then
}
else
dependency {
- {
+ {
GEN_DIR .. _target .. "/" .. _target .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true },
}
custombuildtask {
@@ -311,11 +311,11 @@ if (_OPTIONS["SOURCES"] == nil) then
}
end
end
-end
+end
if (_OPTIONS["SOURCES"] ~= nil) then
dependency {
- {
+ {
GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true },
}
custombuildtask {
@@ -331,17 +331,17 @@ if _OPTIONS["FORCE_VERSION_COMPILE"]=="1" then
}
end
configuration { "mingw*" }
- custombuildtask {
+ 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 .. " $(<) > $(@)" }},
- }
-
+ }
+
configuration { "vs*" }
- prebuildcommands {
+ 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", "\\") ,
- }
-
+ }
+
configuration { }
debugdir (MAME_DIR)
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index 95d0371e414..75fe6a60c77 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -68,7 +68,7 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/analog/nld_opamps.h",
MAME_DIR .. "src/lib/netlist/solver/nld_solver.cpp",
MAME_DIR .. "src/lib/netlist/solver/nld_solver.h",
- MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.h",
+ MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct1.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct2.h",
@@ -78,7 +78,7 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/solver/mat_cr.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_sm.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct_lu.h",
- MAME_DIR .. "src/lib/netlist/solver/vector_base.h",
+ MAME_DIR .. "src/lib/netlist/solver/vector_base.h",
MAME_DIR .. "src/lib/netlist/devices/nld_4020.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_4020.h",
MAME_DIR .. "src/lib/netlist/devices/nld_4066.cpp",
@@ -168,5 +168,5 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/macro/nlm_opamp.cpp",
MAME_DIR .. "src/lib/netlist/macro/nlm_opamp.h",
MAME_DIR .. "src/lib/netlist/macro/nlm_other.cpp",
- MAME_DIR .. "src/lib/netlist/macro/nlm_other.h",
+ MAME_DIR .. "src/lib/netlist/macro/nlm_other.h",
}
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index a8b8debe272..f1bfab95b08 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -10,7 +10,7 @@
---------------------------------------------------------------------------
function string.starts(String,Start)
- return string.sub(String,1,string.len(Start))==Start
+ return string.sub(String,1,string.len(Start))==Start
end
function addlibfromstring(str)
@@ -127,7 +127,7 @@ function osdmodulesbuild()
"__STDC_FORMAT_MACROS",
"__STDC_CONSTANT_MACROS",
}
-
+
files {
MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp",
MAME_DIR .. "src/osd/modules/render/binpacker.cpp",
@@ -202,7 +202,7 @@ function qtdebuggerbuild()
removeflags {
"SingleOutputDir",
}
- local version = str_to_version(_OPTIONS["gcc_version"])
+ 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" }
if (version >= 30600) then
@@ -276,14 +276,14 @@ function qtdebuggerbuild()
custombuildtask {
- { MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.h", GEN_DIR .. "osd/modules/debugger/qt/debuggerview.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.h", GEN_DIR .. "osd/modules/debugger/qt/windowqt.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.h", GEN_DIR .. "osd/modules/debugger/qt/logwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.h", GEN_DIR .. "osd/modules/debugger/qt/dasmwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.h", GEN_DIR .. "osd/modules/debugger/qt/mainwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.h", GEN_DIR .. "osd/modules/debugger/qt/memorywindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.h", GEN_DIR .. "osd/modules/debugger/qt/breakpointswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.h", GEN_DIR .. "osd/modules/debugger/qt/deviceswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.h", GEN_DIR .. "osd/modules/debugger/qt/debuggerview.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.h", GEN_DIR .. "osd/modules/debugger/qt/windowqt.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.h", GEN_DIR .. "osd/modules/debugger/qt/logwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.h", GEN_DIR .. "osd/modules/debugger/qt/dasmwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.h", GEN_DIR .. "osd/modules/debugger/qt/mainwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.h", GEN_DIR .. "osd/modules/debugger/qt/memorywindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.h", GEN_DIR .. "osd/modules/debugger/qt/breakpointswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.h", GEN_DIR .. "osd/modules/debugger/qt/deviceswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
{ MAME_DIR .. "src/osd/modules/debugger/qt/deviceinformationwindow.h", GEN_DIR .. "osd/modules/debugger/qt/deviceinformationwindow.moc.cpp", { },{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
}
diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua
index 7748ff8a419..4869ec8716d 100644
--- a/scripts/src/osd/osdmini.lua
+++ b/scripts/src/osd/osdmini.lua
@@ -41,9 +41,9 @@ project ("osd_" .. _OPTIONS["osd"])
removeflags {
"SingleOutputDir",
}
-
+
dofile("osdmini_cfg.lua")
-
+
includedirs {
MAME_DIR .. "src/emu",
MAME_DIR .. "src/osd",
@@ -94,24 +94,24 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/input/input_windows.h",
MAME_DIR .. "src/osd/modules/input/input_xinput.cpp",
}
-
+
project ("ocore_" .. _OPTIONS["osd"])
uuid (os.uuid("ocore_" .. _OPTIONS["osd"]))
kind (LIBTYPE)
removeflags {
- "SingleOutputDir",
+ "SingleOutputDir",
}
dofile("osdmini_cfg.lua")
-
+
includedirs {
MAME_DIR .. "src/emu",
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
}
-
+
files {
MAME_DIR .. "src/osd/osdnet.cpp",
MAME_DIR .. "src/osd/osdnet.h",
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 03e82ffcb2f..f1d307b8cab 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -89,7 +89,7 @@ function maintargetosdoptions(_target,_subtarget)
configuration { "x64", "vs*" }
libdirs {
path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64")
- }
+ }
end
links {
"psapi",
@@ -116,15 +116,15 @@ function maintargetosdoptions(_target,_subtarget)
"psapi"
}
configuration { }
-
- if _OPTIONS["targetos"]=="macosx" then
+
+ if _OPTIONS["targetos"]=="macosx" then
if _OPTIONS["with-bundled-sdl2"]~=nil then
links {
"SDL2",
}
- end
- end
-
+ end
+ end
+
end
@@ -145,8 +145,8 @@ newoption {
}
newoption {
- trigger = "SDL_INI_PATH",
- description = "Default search path for .ini files",
+ trigger = "SDL_INI_PATH",
+ description = "Default search path for .ini files",
}
newoption {
@@ -255,22 +255,22 @@ if BASE_TARGETOS=="unix" then
"-framework QuartzCore",
"-framework OpenGL",
}
-
-
+
+
if os_version>=101100 then
linkoptions {
"-weak_framework Metal",
}
end
if _OPTIONS["with-bundled-sdl2"]~=nil then
- linkoptions {
- "-framework AudioUnit",
- "-framework CoreAudio",
- "-framework Carbon",
- "-framework ForceFeedback",
- "-framework IOKit",
- "-framework CoreVideo",
- }
+ linkoptions {
+ "-framework AudioUnit",
+ "-framework CoreAudio",
+ "-framework Carbon",
+ "-framework ForceFeedback",
+ "-framework IOKit",
+ "-framework CoreVideo",
+ }
else
if _OPTIONS["USE_LIBSDL"]~="1" then
linkoptions {
@@ -303,8 +303,8 @@ if BASE_TARGETOS=="unix" then
local str = backtick(sdlconfigcmd() .. " --libs")
addlibfromstring(str)
addoptionsfromstring(str)
- end
-
+ end
+
if _OPTIONS["targetos"]~="haiku" and _OPTIONS["targetos"]~="android" then
links {
"m",
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index 7a692522297..0fd15e5ca27 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -19,9 +19,9 @@ if _OPTIONS["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS[
end
if _OPTIONS["SDL_INI_PATH"]~=nil then
- defines {
- "'INI_PATH=\"" .. _OPTIONS["SDL_INI_PATH"] .. "\"'",
- }
+ defines {
+ "'INI_PATH=\"" .. _OPTIONS["SDL_INI_PATH"] .. "\"'",
+ }
end
if _OPTIONS["NO_X11"]=="1" then
@@ -74,20 +74,20 @@ if BASE_TARGETOS=="unix" then
"SDLMAME_UNIX",
}
if _OPTIONS["targetos"]=="macosx" then
- if _OPTIONS["with-bundled-sdl2"]==nil then
- if _OPTIONS["USE_LIBSDL"]~="1" then
- buildoptions {
- "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
- }
- else
- defines {
- "MACOSX_USE_LIBSDL",
- }
- buildoptions {
- backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"),
- }
- end
- end
+ if _OPTIONS["with-bundled-sdl2"]==nil then
+ if _OPTIONS["USE_LIBSDL"]~="1" then
+ buildoptions {
+ "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
+ }
+ else
+ defines {
+ "MACOSX_USE_LIBSDL",
+ }
+ buildoptions {
+ backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"),
+ }
+ end
+ end
else
buildoptions {
backtick(sdlconfigcmd() .. " --cflags"),
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index 97880e4a260..f9a886dc176 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -275,10 +275,10 @@ if _OPTIONS["with-tools"] then
kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
- if _OPTIONS["SEPARATE_BIN"]~="1" then
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
@@ -289,7 +289,7 @@ if _OPTIONS["with-tools"] then
includedirs {
MAME_DIR .. "src/osd",
}
-
+
files {
MAME_DIR .. "src/osd/windows/ledutil.cpp",
}
diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua
index b3d605d9dc7..428974c23df 100644
--- a/scripts/src/sound.lua
+++ b/scripts/src/sound.lua
@@ -81,7 +81,7 @@ if (SOUNDS["DISCRETE"]~=null) then
MAME_DIR .. "src/devices/sound/disc_mth.inc",
MAME_DIR .. "src/devices/sound/disc_sys.inc",
MAME_DIR .. "src/devices/sound/disc_wav.h",
- MAME_DIR .. "src/devices/sound/disc_wav.inc",
+ MAME_DIR .. "src/devices/sound/disc_wav.inc",
}
end
@@ -135,8 +135,8 @@ end
if (SOUNDS["TIA"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/tiasound.cpp",
- MAME_DIR .. "src/devices/sound/tiasound.h",
+ MAME_DIR .. "src/devices/sound/tiasound.cpp",
+ MAME_DIR .. "src/devices/sound/tiasound.h",
MAME_DIR .. "src/devices/sound/tiaintf.cpp",
MAME_DIR .. "src/devices/sound/tiaintf.h",
}
@@ -483,7 +483,7 @@ end
---------------------------------------------------
--- L7A1045 L6028 DSP-A
+-- L7A1045 L6028 DSP-A
--@src/devices/sound/l7a1045_l6028_dsp_a.h,SOUNDS["L7A1045"] = true
---------------------------------------------------
@@ -730,8 +730,8 @@ end
if (SOUNDS["QSOUND"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/qsound.cpp",
- MAME_DIR .. "src/devices/sound/qsound.h",
+ MAME_DIR .. "src/devices/sound/qsound.cpp",
+ MAME_DIR .. "src/devices/sound/qsound.h",
MAME_DIR .. "src/devices/cpu/dsp16/dsp16.cpp",
MAME_DIR .. "src/devices/cpu/dsp16/dsp16.h",
MAME_DIR .. "src/devices/cpu/dsp16/dsp16dis.cpp",
@@ -1154,8 +1154,8 @@ if (SOUNDS["YM2413"]~=null) then
}
end
-if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null or SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then
---if (SOUNDS["YM2203"]~=null) then
+if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null or SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then
+--if (SOUNDS["YM2203"]~=null) then
files {
MAME_DIR .. "src/devices/sound/2203intf.cpp",
MAME_DIR .. "src/devices/sound/2203intf.h",
@@ -1169,12 +1169,12 @@ if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null o
--if (SOUNDS["YM2608"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/2608intf.cpp",
- MAME_DIR .. "src/devices/sound/2608intf.h",
- MAME_DIR .. "src/devices/sound/ay8910.cpp",
- MAME_DIR .. "src/devices/sound/ay8910.h",
- MAME_DIR .. "src/devices/sound/fm.cpp",
- MAME_DIR .. "src/devices/sound/fm.h",
+ MAME_DIR .. "src/devices/sound/2608intf.cpp",
+ MAME_DIR .. "src/devices/sound/2608intf.h",
+ MAME_DIR .. "src/devices/sound/ay8910.cpp",
+ MAME_DIR .. "src/devices/sound/ay8910.h",
+ MAME_DIR .. "src/devices/sound/fm.cpp",
+ MAME_DIR .. "src/devices/sound/fm.h",
MAME_DIR .. "src/devices/sound/ymdeltat.cpp",
MAME_DIR .. "src/devices/sound/ymdeltat.h",
}
@@ -1182,12 +1182,12 @@ if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null o
--if (SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/2610intf.cpp",
- MAME_DIR .. "src/devices/sound/2610intf.h",
- MAME_DIR .. "src/devices/sound/ay8910.cpp",
- MAME_DIR .. "src/devices/sound/ay8910.h",
- MAME_DIR .. "src/devices/sound/fm.cpp",
- MAME_DIR .. "src/devices/sound/fm.h",
+ MAME_DIR .. "src/devices/sound/2610intf.cpp",
+ MAME_DIR .. "src/devices/sound/2610intf.h",
+ MAME_DIR .. "src/devices/sound/ay8910.cpp",
+ MAME_DIR .. "src/devices/sound/ay8910.h",
+ MAME_DIR .. "src/devices/sound/fm.cpp",
+ MAME_DIR .. "src/devices/sound/fm.h",
MAME_DIR .. "src/devices/sound/ymdeltat.cpp",
MAME_DIR .. "src/devices/sound/ymdeltat.h",
}
@@ -1195,10 +1195,10 @@ if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null o
--if (SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/2612intf.cpp",
- MAME_DIR .. "src/devices/sound/2612intf.h",
- MAME_DIR .. "src/devices/sound/ay8910.cpp",
- MAME_DIR .. "src/devices/sound/ay8910.h",
+ MAME_DIR .. "src/devices/sound/2612intf.cpp",
+ MAME_DIR .. "src/devices/sound/2612intf.h",
+ MAME_DIR .. "src/devices/sound/ay8910.cpp",
+ MAME_DIR .. "src/devices/sound/ay8910.h",
MAME_DIR .. "src/devices/sound/fm2612.cpp",
}
--end
@@ -1207,10 +1207,10 @@ end
if (SOUNDS["YM3812"]~=null or SOUNDS["YM3526"]~=null or SOUNDS["Y8950"]~=null) then
--if (SOUNDS["YM3812"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/3812intf.cpp",
- MAME_DIR .. "src/devices/sound/3812intf.h",
- MAME_DIR .. "src/devices/sound/fmopl.cpp",
- MAME_DIR .. "src/devices/sound/fmopl.h",
+ MAME_DIR .. "src/devices/sound/3812intf.cpp",
+ MAME_DIR .. "src/devices/sound/3812intf.h",
+ MAME_DIR .. "src/devices/sound/fmopl.cpp",
+ MAME_DIR .. "src/devices/sound/fmopl.h",
MAME_DIR .. "src/devices/sound/ymdeltat.cpp",
MAME_DIR .. "src/devices/sound/ymdeltat.h",
}
@@ -1218,10 +1218,10 @@ if (SOUNDS["YM3812"]~=null or SOUNDS["YM3526"]~=null or SOUNDS["Y8950"]~=null) t
--if (SOUNDS["YM3526"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/3526intf.cpp",
- MAME_DIR .. "src/devices/sound/3526intf.h",
- MAME_DIR .. "src/devices/sound/fmopl.cpp",
- MAME_DIR .. "src/devices/sound/fmopl.h",
+ MAME_DIR .. "src/devices/sound/3526intf.cpp",
+ MAME_DIR .. "src/devices/sound/3526intf.h",
+ MAME_DIR .. "src/devices/sound/fmopl.cpp",
+ MAME_DIR .. "src/devices/sound/fmopl.h",
MAME_DIR .. "src/devices/sound/ymdeltat.cpp",
MAME_DIR .. "src/devices/sound/ymdeltat.h",
}
@@ -1229,10 +1229,10 @@ if (SOUNDS["YM3812"]~=null or SOUNDS["YM3526"]~=null or SOUNDS["Y8950"]~=null) t
--if (SOUNDS["Y8950"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/8950intf.cpp",
- MAME_DIR .. "src/devices/sound/8950intf.h",
- MAME_DIR .. "src/devices/sound/fmopl.cpp",
- MAME_DIR .. "src/devices/sound/fmopl.h",
+ MAME_DIR .. "src/devices/sound/8950intf.cpp",
+ MAME_DIR .. "src/devices/sound/8950intf.h",
+ MAME_DIR .. "src/devices/sound/fmopl.cpp",
+ MAME_DIR .. "src/devices/sound/fmopl.h",
MAME_DIR .. "src/devices/sound/ymdeltat.cpp",
MAME_DIR .. "src/devices/sound/ymdeltat.h",
}
@@ -1241,8 +1241,8 @@ end
if (SOUNDS["YMF262"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/ymf262.cpp",
- MAME_DIR .. "src/devices/sound/ymf262.h",
+ MAME_DIR .. "src/devices/sound/ymf262.cpp",
+ MAME_DIR .. "src/devices/sound/ymf262.h",
MAME_DIR .. "src/devices/sound/262intf.cpp",
MAME_DIR .. "src/devices/sound/262intf.h",
}
@@ -1283,8 +1283,8 @@ end
if (SOUNDS["YMZ770"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/ymz770.cpp",
- MAME_DIR .. "src/devices/sound/ymz770.h",
+ MAME_DIR .. "src/devices/sound/ymz770.cpp",
+ MAME_DIR .. "src/devices/sound/ymz770.h",
MAME_DIR .. "src/devices/sound/mpeg_audio.cpp",
MAME_DIR .. "src/devices/sound/mpeg_audio.h",
}
diff --git a/scripts/src/tests.lua b/scripts/src/tests.lua
index b6a01efdd02..b5bb5b37366 100644
--- a/scripts/src/tests.lua
+++ b/scripts/src/tests.lua
@@ -25,7 +25,7 @@ project "gtest"
configuration { "vs*" }
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd1195", -- error #1195: conversion from integer to smaller pointer
+ "/Qwd1195", -- error #1195: conversion from integer to smaller pointer
}
end
@@ -42,13 +42,13 @@ end
project("mametests")
uuid ("66d4c639-196b-4065-a411-7ee9266564f5")
- kind "ConsoleApp"
+ kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
- if _OPTIONS["SEPARATE_BIN"]~="1" then
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index 8dc7a47cdc9..913358f1d20 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -529,27 +529,27 @@ uuid ("7c5396d1-2a1a-4c93-bed6-6b8fa182054a")
kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
if _OPTIONS["SEPARATE_BIN"]~="1" then
- targetdir(MAME_DIR)
+ targetdir(MAME_DIR)
end
links {
- "utils",
- "ocore_" .. _OPTIONS["osd"],
- "netlist",
+ "utils",
+ "ocore_" .. _OPTIONS["osd"],
+ "netlist",
}
includedirs {
- MAME_DIR .. "src/osd",
- MAME_DIR .. "src/lib/util",
- MAME_DIR .. "src/lib/netlist",
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/lib/util",
+ MAME_DIR .. "src/lib/netlist",
}
files {
- MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp",
+ MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp",
MAME_DIR .. "src/emu/emucore.cpp",
}
diff --git a/scripts/src/video.lua b/scripts/src/video.lua
index 96a310f154b..e81f8e3f41b 100644
--- a/scripts/src/video.lua
+++ b/scripts/src/video.lua
@@ -513,9 +513,9 @@ if (VIDEOS["MOS6566"]~=null) then
end
-files {
+files {
MAME_DIR .. "src/devices/video/cgapal.cpp",
- MAME_DIR .. "src/devices/video/cgapal.h",
+ MAME_DIR .. "src/devices/video/cgapal.h",
}
--------------------------------------------------
diff --git a/scripts/target/ldplayer/ldplayer.lua b/scripts/target/ldplayer/ldplayer.lua
index 1f4aafcd69f..4348f3bd318 100644
--- a/scripts/target/ldplayer/ldplayer.lua
+++ b/scripts/target/ldplayer/ldplayer.lua
@@ -56,7 +56,7 @@ function createProjects_ldplayer_ldplayer(_target, _subtarget)
targetsubdir(_target .."_" .. _subtarget)
kind (LIBTYPE)
uuid (os.uuid("drvldplayer"))
-
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
@@ -78,7 +78,7 @@ function createProjects_ldplayer_ldplayer(_target, _subtarget)
custombuildtask {
layoutbuildtask("ldplayer/layout", "pr8210"),
- }
+ }
end
function linkProjects_ldplayer_ldplayer(_target, _subtarget)
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 9a8937f0a78..240855fd53e 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -3238,7 +3238,7 @@ files {
MAME_DIR .. "src/mame/machine/n64.cpp",
MAME_DIR .. "src/mame/video/n64.cpp",
MAME_DIR .. "src/mame/video/n64types.h",
- MAME_DIR .. "src/mame/video/rdpfiltr.inc",
+ MAME_DIR .. "src/mame/video/rdpfiltr.inc",
MAME_DIR .. "src/mame/video/n64.h",
MAME_DIR .. "src/mame/video/rdpblend.cpp",
MAME_DIR .. "src/mame/video/rdpblend.h",
diff --git a/scripts/target/mame/dummy.lua b/scripts/target/mame/dummy.lua
index f64a02fbae7..ec5d366abc6 100644
--- a/scripts/target/mame/dummy.lua
+++ b/scripts/target/mame/dummy.lua
@@ -19,7 +19,7 @@ function createProjects_mame_dummy(_target, _subtarget)
uuid (os.uuid("drv-mame_dummy"))
addprojectflags()
precompiledheaders()
-
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
diff --git a/scripts/target/mame/mame.lua b/scripts/target/mame/mame.lua
index 6769f26a701..b7360486042 100644
--- a/scripts/target/mame/mame.lua
+++ b/scripts/target/mame/mame.lua
@@ -14,7 +14,7 @@ dofile("mess.lua")
function createProjects_mame_mame(_target, _subtarget)
createProjects_mame_arcade(_target, _subtarget)
- createProjects_mame_mess(_target, _subtarget)
+ createProjects_mame_mess(_target, _subtarget)
end
function linkProjects_mame_mame(_target, _subtarget)
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 5687a044a41..4f5c1ec385a 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -2880,7 +2880,7 @@ files {
createMESSProjects(_target, _subtarget, "usp")
files {
- MAME_DIR .. "src/mame/drivers/patinho_feio.cpp",
+ MAME_DIR .. "src/mame/drivers/patinho_feio.cpp",
}
createMESSProjects(_target, _subtarget, "veb")
@@ -3110,8 +3110,8 @@ files {
MAME_DIR .. "src/mame/drivers/lft.cpp",
MAME_DIR .. "src/mame/drivers/lg-dvd.cpp",
MAME_DIR .. "src/mame/drivers/lola8a.cpp",
- MAME_DIR .. "src/mame/drivers/m79152pc.cpp",
- MAME_DIR .. "src/mame/drivers/marywu.cpp",
+ MAME_DIR .. "src/mame/drivers/m79152pc.cpp",
+ MAME_DIR .. "src/mame/drivers/marywu.cpp",
MAME_DIR .. "src/mame/drivers/mccpm.cpp",
MAME_DIR .. "src/mame/drivers/mes.cpp",
MAME_DIR .. "src/mame/drivers/mice.cpp",
diff --git a/scripts/target/mame/nl.lua b/scripts/target/mame/nl.lua
index 3f06f495cd6..bf0fd462beb 100644
--- a/scripts/target/mame/nl.lua
+++ b/scripts/target/mame/nl.lua
@@ -84,7 +84,7 @@ function createProjects_mame_nl(_target, _subtarget)
targetsubdir(_target .."_" .. _subtarget)
kind (LIBTYPE)
uuid (os.uuid("drv-mame-nl"))
-
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
diff --git a/scripts/target/mame/tiny.lua b/scripts/target/mame/tiny.lua
index 75d0cd955df..36b4032a525 100644
--- a/scripts/target/mame/tiny.lua
+++ b/scripts/target/mame/tiny.lua
@@ -82,7 +82,7 @@ function createProjects_mame_tiny(_target, _subtarget)
uuid (os.uuid("drv-mame-tiny"))
addprojectflags()
precompiledheaders()
-
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 968d974caa3..2a5490fab06 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -35,8 +35,8 @@ newoption {
{ "osx-clang", "OSX (Clang compiler)" },
{ "pnacl", "Native Client - PNaCl" },
{ "rpi", "RaspberryPi" },
- { "solaris", "Solaris" },
- { "steamlink", "Steam Link" },
+ { "solaris", "Solaris" },
+ { "steamlink", "Steam Link" },
{ "ci20", "Creator-Ci20" },
},
}
@@ -46,12 +46,12 @@ newoption {
value = "toolset",
description = "Choose VS toolset",
allowed = {
- { "intel-14", "Intel C++ Compiler XE 14.0" },
- { "intel-15", "Intel C++ Compiler XE 15.0" },
+ { "intel-14", "Intel C++ Compiler XE 14.0" },
+ { "intel-15", "Intel C++ Compiler XE 15.0" },
{ "vs2013-clang", "Clang 3.6" },
{ "vs2015-clang", "Clang 3.6" },
- { "vs2013-xp", "Visual Studio 2013 targeting XP" },
- { "vs2015-xp", "Visual Studio 2015 targeting XP" },
+ { "vs2013-xp", "Visual Studio 2013 targeting XP" },
+ { "vs2015-xp", "Visual Studio 2015 targeting XP" },
{ "winphone8", "Windows Phone 8.0" },
{ "winphone81", "Windows Phone 8.1" },
{ "winstore81", "Windows Store 8.1" },
@@ -100,7 +100,7 @@ function toolchain(_buildDir, _subDir)
if _OPTIONS["with-ios"] then
iosPlatform = _OPTIONS["with-ios"]
end
-
+
local windowsPlatform = "10.0.10240.0"
if _OPTIONS["with-windows"] then
windowsPlatform = _OPTIONS["with-windows"]
@@ -119,7 +119,7 @@ function toolchain(_buildDir, _subDir)
print("Set ANDROID_NDK_ARM and ANDROID_NDK_ROOT envrionment variables.")
end
- premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/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
@@ -132,59 +132,59 @@ function toolchain(_buildDir, _subDir)
print("Set ANDROID_NDK_ARM64 and ANDROID_NDK_ROOT envrionment variables.")
end
- premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/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")
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.")
end
- premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/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")
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.")
end
- premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/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")
end
-
+
if "android-x86" == _OPTIONS["gcc"] then
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
- premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/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")
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.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
@@ -396,15 +396,15 @@ function toolchain(_buildDir, _subDir)
if "winstore82" == _OPTIONS["vs"] then
premake.vstudio.toolset = "v140"
premake.vstudio.storeapp = "8.2"
-
+
-- If needed, depending on GENie version, enable file-level configuration
if enablefilelevelconfig ~= nil then
enablefilelevelconfig()
end
-
+
local action = premake.action.current()
action.vstudio.windowsTargetPlatformVersion = windowsPlatform
-
+
platforms { "ARM" }
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winstore82")
end
@@ -423,7 +423,7 @@ function toolchain(_buildDir, _subDir)
premake.vstudio.toolset = ("v120_xp")
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp")
end
-
+
if ("vs2015-xp") == _OPTIONS["vs"] then
premake.vstudio.toolset = ("v140_xp")
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp")
@@ -568,7 +568,7 @@ function toolchain(_buildDir, _subDir)
}
defines {
"__VCCOREVER__=0x04000000", -- There is no special prefedined compiler symbol to detect RaspberryPi, faking it.
- }
+ }
linkoptions {
"-Wl,--gc-sections",
}
@@ -594,10 +594,10 @@ function toolchain(_buildDir, _subDir)
"$(CI20_SYSROOT)/mipsel-r2-hard/usr/include/mipsel-linux-gnu/c++/4.9",
"$(CI20_SYSROOT)/mipsel-r2-hard/usr/include/c++/4.9/backward",
"$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib/gcc/mipsel-linux-gnu/4.9/include",
- "$(CI20_SYSROOT)/mipsel-r2-hard/usr/local/include",
+ "$(CI20_SYSROOT)/mipsel-r2-hard/usr/local/include",
"$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib/gcc/mipsel-linux-gnu/4.9/include-fixed",
"$(CI20_SYSROOT)/mipsel-r2-hard/usr/include/mipsel-linux-gnu",
- "$(CI20_SYSROOT)/mipsel-r2-hard/usr/include",
+ "$(CI20_SYSROOT)/mipsel-r2-hard/usr/include",
}
links {
"c",
@@ -607,7 +607,7 @@ function toolchain(_buildDir, _subDir)
"stdc++",
"gcc_s",
}
-
+
buildoptions {
"--sysroot=$(CI20_SYSROOT)",
"-Wno-pragmas",
@@ -879,7 +879,7 @@ function toolchain(_buildDir, _subDir)
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm64/usr/lib/crtend_so.o",
"-target aarch64-none-linux-android",
}
-
+
configuration { "android-mips" }
targetdir (_buildDir .. "android-mips" .. "/bin")
objdir (_buildDir .. "android-mips" .. "/obj")
@@ -901,7 +901,7 @@ function toolchain(_buildDir, _subDir)
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/crtbegin_so.o",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/crtend_so.o",
}
-
+
configuration { "android-mips64" }
androidPlatform = "android-21" -- supported from API 21
targetdir (_buildDir .. "android-mips64" .. "/bin")
@@ -971,7 +971,7 @@ function toolchain(_buildDir, _subDir)
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86_64/usr/lib64/crtbegin_so.o",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86_64/usr/lib64/crtend_so.o",
}
-
+
configuration { "asmjs" }
targetdir (_buildDir .. "asmjs" .. "/bin")
objdir (_buildDir .. "asmjs" .. "/obj")
@@ -1002,7 +1002,7 @@ function toolchain(_buildDir, _subDir)
"-ffunction-sections",
"-Wunused-value",
}
-
+
configuration { "pnacl" }
buildoptions {
"-Wno-tautological-undefined-compare",