mirror of
https://github.com/holub/mame
synced 2025-07-03 09:06:08 +03:00
scrclean on lua scripts (nw)
This commit is contained in:
Miodrag Milanovic
parent
3fb7f61cfc
commit
9b3788035c
@ -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
|
||||
|
||||
@ -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++"
|
||||
@ -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",
|
||||
|
||||
}
|
||||
|
||||
@ -1060,7 +1060,7 @@ configuration { "steamlink" }
|
||||
"dl",
|
||||
"EGL",
|
||||
"GLESv2",
|
||||
"SDL2",
|
||||
"SDL2",
|
||||
}
|
||||
defines {
|
||||
"EGL_API_FB",
|
||||
@ -1068,7 +1068,7 @@ configuration { "steamlink" }
|
||||
|
||||
configuration { "rpi" }
|
||||
links {
|
||||
"SDL2",
|
||||
"SDL2",
|
||||
"fontconfig",
|
||||
"X11",
|
||||
"GLESv2",
|
||||
@ -1082,7 +1082,7 @@ configuration { "rpi" }
|
||||
|
||||
configuration { "ci20" }
|
||||
links {
|
||||
"SDL2",
|
||||
"SDL2",
|
||||
"asound",
|
||||
"fontconfig",
|
||||
"freetype",
|
||||
@ -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); }
|
||||
"/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
|
||||
"/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
|
||||
"/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
|
||||
|
||||
|
||||
@ -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",
|
||||
}
|
||||
@ -1640,11 +1640,11 @@ end
|
||||
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",
|
||||
|
||||
@ -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" },
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
--------------------------------------------------
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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)
|
||||
@ -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 $(@)" }},
|
||||
|
||||
}
|
||||
|
||||
@ -117,13 +117,13 @@ function maintargetosdoptions(_target,_subtarget)
|
||||
}
|
||||
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 {
|
||||
@ -263,14 +263,14 @@ if BASE_TARGETOS=="unix" then
|
||||
}
|
||||
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 {
|
||||
|
||||
@ -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"),
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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",
|
||||
}
|
||||
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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" },
|
||||
@ -594,7 +594,7 @@ 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",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user