diff --git a/scripts/genie.lua b/scripts/genie.lua
index d4caa547904..cccd66266fd 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -675,16 +675,11 @@ end
 
 	if _ACTION == "gmake" then
 
-	--we compile C-only to C89 standard with GNU extensions
-if (_OPTIONS["targetos"]=="solaris") then
+	--we compile C-only to C99 standard with GNU extensions
+
 	buildoptions_c {
 		"-std=gnu99",
 	}
-else
-	buildoptions_c {
-		"-std=gnu89",
-	}
-end
 
 local version = str_to_version(_OPTIONS["gcc_version"])
 if string.find(_OPTIONS["gcc"], "clang") and ((version < 30500) or (_OPTIONS["targetos"]=="macosx" and (version <= 60000))) then
@@ -1058,9 +1053,13 @@ configuration { "osx*" }
 			"pthread",
 		}
 
-configuration { "mingw-clang" }
+configuration { "mingw*" }
+		linkoptions {
+			"-static-libgcc",
+			"-static-libstdc++",
+			"-static",
+		}
 		links {
-			"gcc",
 			"stdc++",
 			"user32",
 			"winmm",
@@ -1070,20 +1069,6 @@ configuration { "mingw-clang" }
 			"pthread",
 		}
 
-configuration { "mingw*-gcc" }
-		linkoptions {
-			"-static-libgcc",
-			"-static-libstdc++",
-			"-static",
-		}
-		links {
-			"user32",
-			"winmm",
-			"advapi32",
-			"shlwapi",
-			"wsock32",
-		}
-
 configuration { "vs*" }
 		defines {
 			"XML_STATIC",
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index da3740bd28d..f87f0bc43fb 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -385,11 +385,6 @@ project "lua"
 			"-Wno-bad-function-cast"
 		}
 		
-	configuration { "mingw-clang" }
-		defines {
-			"LUA_USE_C89",
-		}
-
 	configuration { "vs*" }
 		buildoptions {
 			"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 5d3646b48ea..9c8b78ee485 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -485,8 +485,6 @@ function toolchain(_buildDir, _subDir)
 
 	configuration { "mingw-clang" }
 		linkoptions {
-			"-Qunused-arguments",
-			"-Wno-error=unused-command-line-argument-hard-error-in-future",
 			"-Wl,--allow-multiple-definition",
 		}