added clang and gcc flags needed for compilation of 3rdparty libraries, also removed checking for shadowing in them (nw)

This commit is contained in:
Miodrag Milanovic 2015-11-04 11:21:08 +01:00
parent 91debc7cc9
commit ecdc99b0e6

View File

@ -31,11 +31,6 @@ project "expat"
MAME_DIR .. "3rdparty/expat/lib/xmlrole.c", MAME_DIR .. "3rdparty/expat/lib/xmlrole.c",
MAME_DIR .. "3rdparty/expat/lib/xmltok.c", MAME_DIR .. "3rdparty/expat/lib/xmltok.c",
} }
if (_OPTIONS["SHADOW_CHECK"]=="1") then
removebuildoptions {
"-Wshadow"
}
end
else else
links { links {
"expat", "expat",
@ -86,11 +81,6 @@ project "zlib"
MAME_DIR .. "3rdparty/zlib/uncompr.c", MAME_DIR .. "3rdparty/zlib/uncompr.c",
MAME_DIR .. "3rdparty/zlib/zutil.c", MAME_DIR .. "3rdparty/zlib/zutil.c",
} }
if (_OPTIONS["SHADOW_CHECK"]=="1") then
removebuildoptions {
"-Wshadow"
}
end
else else
links { links {
"z", "z",
@ -123,6 +113,17 @@ project "softfloat"
"/wd4146", -- warning C4146: unary minus operator applied to unsigned type, result still unsigned "/wd4146", -- warning C4146: unary minus operator applied to unsigned type, result still unsigned
} }
configuration { "gmake" }
buildoptions {
"-Wno-sign-compare",
}
if string.find(_OPTIONS["gcc"], "clang") then
buildoptions {
"-Wno-tautological-compare",
}
end
configuration { } configuration { }
options { options {
@ -147,11 +148,6 @@ project "softfloat"
MAME_DIR .. "3rdparty/softfloat/fsincos.c", MAME_DIR .. "3rdparty/softfloat/fsincos.c",
MAME_DIR .. "3rdparty/softfloat/fyl2x.c", MAME_DIR .. "3rdparty/softfloat/fyl2x.c",
} }
if (_OPTIONS["SHADOW_CHECK"]=="1") then
removebuildoptions {
"-Wshadow"
}
end
-------------------------------------------------- --------------------------------------------------
-- libJPEG library objects -- libJPEG library objects
@ -219,11 +215,6 @@ project "jpeg"
MAME_DIR .. "3rdparty/libjpeg/jmemmgr.c", MAME_DIR .. "3rdparty/libjpeg/jmemmgr.c",
MAME_DIR .. "3rdparty/libjpeg/jmemansi.c", MAME_DIR .. "3rdparty/libjpeg/jmemansi.c",
} }
if (_OPTIONS["SHADOW_CHECK"]=="1") then
removebuildoptions {
"-Wshadow"
}
end
else else
links { links {
"jpeg", "jpeg",
@ -267,7 +258,11 @@ project "flac"
"-Wno-unused-function", "-Wno-unused-function",
"-O0", "-O0",
} }
if string.find(_OPTIONS["gcc"], "clang") then
buildoptions {
"-Wno-enum-conversion",
}
end
configuration { } configuration { }
includedirs { includedirs {
@ -292,11 +287,6 @@ project "flac"
MAME_DIR .. "3rdparty/libflac/src/libFLAC/stream_encoder_framing.c", MAME_DIR .. "3rdparty/libflac/src/libFLAC/stream_encoder_framing.c",
MAME_DIR .. "3rdparty/libflac/src/libFLAC/window.c", MAME_DIR .. "3rdparty/libflac/src/libFLAC/window.c",
} }
if (_OPTIONS["SHADOW_CHECK"]=="1") then
removebuildoptions {
"-Wshadow"
}
end
else else
links { links {
"FLAC", "FLAC",
@ -347,11 +337,6 @@ project "7z"
MAME_DIR .. "3rdparty/lzma/C/Ppmd7Dec.c", MAME_DIR .. "3rdparty/lzma/C/Ppmd7Dec.c",
MAME_DIR .. "3rdparty/lzma/C/7zStream.c", MAME_DIR .. "3rdparty/lzma/C/7zStream.c",
} }
if (_OPTIONS["SHADOW_CHECK"]=="1") then
removebuildoptions {
"-Wshadow"
}
end
-------------------------------------------------- --------------------------------------------------
-- LUA library objects -- LUA library objects
@ -434,11 +419,6 @@ project "lua"
MAME_DIR .. "3rdparty/lua/src/linit.c", MAME_DIR .. "3rdparty/lua/src/linit.c",
MAME_DIR .. "3rdparty/lua/src/lutf8lib.c", MAME_DIR .. "3rdparty/lua/src/lutf8lib.c",
} }
if (_OPTIONS["SHADOW_CHECK"]=="1") then
removebuildoptions {
"-Wshadow"
}
end
else else
links { links {
"lua", "lua",
@ -479,11 +459,6 @@ project "lsqlite3"
files { files {
MAME_DIR .. "3rdparty/lsqlite3/lsqlite3.c", MAME_DIR .. "3rdparty/lsqlite3/lsqlite3.c",
} }
if (_OPTIONS["SHADOW_CHECK"]=="1") then
removebuildoptions {
"-Wshadow"
}
end
-------------------------------------------------- --------------------------------------------------
-- mongoose library objects -- mongoose library objects
@ -524,11 +499,6 @@ project "mongoose"
files { files {
MAME_DIR .. "3rdparty/mongoose/mongoose.c", MAME_DIR .. "3rdparty/mongoose/mongoose.c",
} }
if (_OPTIONS["SHADOW_CHECK"]=="1") then
removebuildoptions {
"-Wshadow"
}
end
-------------------------------------------------- --------------------------------------------------
-- jsoncpp library objects -- jsoncpp library objects
@ -559,11 +529,6 @@ project "jsoncpp"
MAME_DIR .. "3rdparty/jsoncpp/src/lib_json/json_writer.cpp", MAME_DIR .. "3rdparty/jsoncpp/src/lib_json/json_writer.cpp",
} }
if (_OPTIONS["SHADOW_CHECK"]=="1") then
removebuildoptions {
"-Wshadow"
}
end
-------------------------------------------------- --------------------------------------------------
-- SQLite3 library objects -- SQLite3 library objects
@ -595,16 +560,20 @@ project "sqllite3"
"-Wno-undef", "-Wno-undef",
} }
local version = str_to_version(_OPTIONS["gcc_version"])
if _OPTIONS["gcc"]~=nil and not string.find(_OPTIONS["gcc"], "clang") then
if (version >= 40800) then
buildoptions_c {
"-Wno-array-bounds",
}
end
end
configuration { } configuration { }
files { files {
MAME_DIR .. "3rdparty/sqlite3/sqlite3.c", MAME_DIR .. "3rdparty/sqlite3/sqlite3.c",
} }
if (_OPTIONS["SHADOW_CHECK"]=="1") then
removebuildoptions {
"-Wshadow"
}
end
else else
links { links {
"sqlite3", "sqlite3",
@ -684,11 +653,6 @@ project "portmidi"
MAME_DIR .. "3rdparty/portmidi/porttime/ptmacosx_mach.c", MAME_DIR .. "3rdparty/portmidi/porttime/ptmacosx_mach.c",
} }
end end
if (_OPTIONS["SHADOW_CHECK"]=="1") then
removebuildoptions {
"-Wshadow"
}
end
else else
links { links {
"portmidi", "portmidi",
@ -810,11 +774,6 @@ project "bgfx"
MAME_DIR .. "3rdparty/bgfx/src/renderer_mtl.mm", MAME_DIR .. "3rdparty/bgfx/src/renderer_mtl.mm",
} }
end end
if (_OPTIONS["SHADOW_CHECK"]=="1") then
removebuildoptions {
"-Wshadow"
}
end
end end
-------------------------------------------------- --------------------------------------------------
@ -957,11 +916,6 @@ project "portaudio"
} }
end end
if (_OPTIONS["SHADOW_CHECK"]=="1") then
removebuildoptions {
"-Wshadow"
}
end
else else
links { links {
"portaudio", "portaudio",