From ecdc99b0e6e57bfc5e0bb9ff22d436ba8c6353db Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Wed, 4 Nov 2015 11:21:08 +0100
Subject: [PATCH] added clang and gcc flags needed for compilation of 3rdparty
 libraries, also removed checking for shadowing in them (nw)

---
 scripts/src/3rdparty.lua | 96 +++++++++++-----------------------------
 1 file changed, 25 insertions(+), 71 deletions(-)

diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 6e215186b2a..66e346531eb 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -31,11 +31,6 @@ project "expat"
 		MAME_DIR .. "3rdparty/expat/lib/xmlrole.c",
 		MAME_DIR .. "3rdparty/expat/lib/xmltok.c",
 	}
-	if (_OPTIONS["SHADOW_CHECK"]=="1") then
-		removebuildoptions {
-			"-Wshadow"
-		}
-	end
 else
 links {
 	"expat",
@@ -86,11 +81,6 @@ project "zlib"
 		MAME_DIR .. "3rdparty/zlib/uncompr.c",
 		MAME_DIR .. "3rdparty/zlib/zutil.c",
 	}
-	if (_OPTIONS["SHADOW_CHECK"]=="1") then
-		removebuildoptions {
-			"-Wshadow"
-		}
-	end
 else
 links {
 	"z",
@@ -123,6 +113,17 @@ project "softfloat"
 			"/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 { }
 
 	options {
@@ -147,11 +148,6 @@ project "softfloat"
 		MAME_DIR .. "3rdparty/softfloat/fsincos.c",
 		MAME_DIR .. "3rdparty/softfloat/fyl2x.c",
 	}
-	if (_OPTIONS["SHADOW_CHECK"]=="1") then
-		removebuildoptions {
-			"-Wshadow"
-		}
-	end
 
 --------------------------------------------------
 -- libJPEG library objects
@@ -219,11 +215,6 @@ project "jpeg"
 		MAME_DIR .. "3rdparty/libjpeg/jmemmgr.c",
 		MAME_DIR .. "3rdparty/libjpeg/jmemansi.c",
 	}
-	if (_OPTIONS["SHADOW_CHECK"]=="1") then
-		removebuildoptions {
-			"-Wshadow"
-		}
-	end
 else
 links {
 	"jpeg",
@@ -267,7 +258,11 @@ project "flac"
 			"-Wno-unused-function",
 			"-O0",
 		}
-
+	if string.find(_OPTIONS["gcc"], "clang") then
+		buildoptions {
+			"-Wno-enum-conversion",
+		}
+	end
 	configuration { }
 
 	includedirs {
@@ -292,11 +287,6 @@ project "flac"
 		MAME_DIR .. "3rdparty/libflac/src/libFLAC/stream_encoder_framing.c",
 		MAME_DIR .. "3rdparty/libflac/src/libFLAC/window.c",
 	}
-	if (_OPTIONS["SHADOW_CHECK"]=="1") then
-		removebuildoptions {
-			"-Wshadow"
-		}
-	end
 else
 links {
 	"FLAC",
@@ -347,11 +337,6 @@ project "7z"
 			MAME_DIR .. "3rdparty/lzma/C/Ppmd7Dec.c",
 			MAME_DIR .. "3rdparty/lzma/C/7zStream.c",
 		}
-	if (_OPTIONS["SHADOW_CHECK"]=="1") then
-		removebuildoptions {
-			"-Wshadow"
-		}
-	end
 
 --------------------------------------------------
 -- LUA library objects
@@ -434,11 +419,6 @@ project "lua"
 		MAME_DIR .. "3rdparty/lua/src/linit.c",
 		MAME_DIR .. "3rdparty/lua/src/lutf8lib.c",
 	}
-	if (_OPTIONS["SHADOW_CHECK"]=="1") then
-		removebuildoptions {
-			"-Wshadow"
-		}
-	end
 else
 links {
 	"lua",
@@ -479,11 +459,6 @@ project "lsqlite3"
 	files {
 		MAME_DIR .. "3rdparty/lsqlite3/lsqlite3.c",
 	}
-	if (_OPTIONS["SHADOW_CHECK"]=="1") then
-		removebuildoptions {
-			"-Wshadow"
-		}
-	end
 
 --------------------------------------------------
 -- mongoose library objects
@@ -524,11 +499,6 @@ project "mongoose"
 	files {
 		MAME_DIR .. "3rdparty/mongoose/mongoose.c",
 	}
-	if (_OPTIONS["SHADOW_CHECK"]=="1") then
-		removebuildoptions {
-			"-Wshadow"
-		}
-	end
 
 --------------------------------------------------
 -- jsoncpp library objects
@@ -559,11 +529,6 @@ project "jsoncpp"
 		MAME_DIR .. "3rdparty/jsoncpp/src/lib_json/json_writer.cpp",
 		
 	}
-	if (_OPTIONS["SHADOW_CHECK"]=="1") then
-		removebuildoptions {
-			"-Wshadow"
-		}
-	end
 
 --------------------------------------------------
 -- SQLite3 library objects
@@ -594,17 +559,21 @@ project "sqllite3"
 			"-Wno-bad-function-cast",
 			"-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 { }
 
 	files {
 		MAME_DIR .. "3rdparty/sqlite3/sqlite3.c",
 	}
-	if (_OPTIONS["SHADOW_CHECK"]=="1") then
-		removebuildoptions {
-			"-Wshadow"
-		}
-	end
 else
 links {
 	"sqlite3",
@@ -684,11 +653,6 @@ project "portmidi"
 			MAME_DIR .. "3rdparty/portmidi/porttime/ptmacosx_mach.c",
 		}
 	end
-	if (_OPTIONS["SHADOW_CHECK"]=="1") then
-		removebuildoptions {
-			"-Wshadow"
-		}
-	end
 else
 links {
 	"portmidi",
@@ -810,11 +774,6 @@ project "bgfx"
 			MAME_DIR .. "3rdparty/bgfx/src/renderer_mtl.mm",
 		}
 	end
-	if (_OPTIONS["SHADOW_CHECK"]=="1") then
-		removebuildoptions {
-			"-Wshadow"
-		}
-	end
 end
 
 --------------------------------------------------
@@ -957,11 +916,6 @@ project "portaudio"
 		}		
 	end
 	
-	if (_OPTIONS["SHADOW_CHECK"]=="1") then
-		removebuildoptions {
-			"-Wshadow"
-		}
-	end
 else
 links {
 	"portaudio",