summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--scripts/genie.lua14
-rw-r--r--scripts/src/3rdparty.lua18
-rw-r--r--scripts/toolchain.lua10
3 files changed, 31 insertions, 11 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 93cde1c42b1..d4caa547904 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -1058,7 +1058,19 @@ configuration { "osx*" }
"pthread",
}
-configuration { "mingw*" }
+configuration { "mingw-clang" }
+ links {
+ "gcc",
+ "stdc++",
+ "user32",
+ "winmm",
+ "advapi32",
+ "shlwapi",
+ "wsock32",
+ "pthread",
+ }
+
+configuration { "mingw*-gcc" }
linkoptions {
"-static-libgcc",
"-static-libstdc++",
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index c4f460fe697..da3740bd28d 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -251,6 +251,12 @@ if _OPTIONS["vs"]=="intel-15" then
}
end
+ configuration { "mingw-clang" }
+ defines {
+ "SIZE_MAX=UINT_MAX",
+ "SIZE_T_MAX=UINT_MAX",
+ }
+
configuration { "vs2015" }
buildoptions {
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
@@ -378,6 +384,12 @@ project "lua"
buildoptions_c {
"-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
@@ -726,6 +738,7 @@ end
buildoptions {
"-Wno-unknown-attributes",
"-Wno-missing-braces",
+ "-Wno-int-to-pointer-cast",
}
end
end
@@ -942,6 +955,11 @@ project "gtest"
"-Wno-unused-variable",
}
+ configuration { "mingw-clang" }
+ buildoptions {
+ "-O0", -- crash of compiler when doing optimization
+ }
+
configuration { "vs*" }
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index aea8caa6769..5d3646b48ea 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -493,11 +493,6 @@ function toolchain(_buildDir, _subDir)
configuration { "x32", "mingw-clang" }
objdir ( _buildDir .. "mingw-clang/obj")
buildoptions { "-m32" }
- buildoptions {
- "-isystem$(MINGW32)/i686-w64-mingw32/include/c++",
- "-isystem$(MINGW32)/i686-w64-mingw32/include/c++/i686-w64-mingw32",
- "-isystem$(MINGW32)/i686-w64-mingw32/include",
- }
configuration { "x32", "mingw-clang", "Release" }
targetdir (_buildDir .. "mingw-clang/bin/x32/Release")
@@ -508,11 +503,6 @@ function toolchain(_buildDir, _subDir)
configuration { "x64", "mingw-clang" }
objdir (_buildDir .. "mingw-clang/obj")
buildoptions { "-m64" }
- buildoptions {
- "-isystem$(MINGW64)/x86_64-w64-mingw32/include/c++",
- "-isystem$(MINGW64)/x86_64-w64-mingw32/include/c++/x86_64-w64-mingw32",
- "-isystem$(MINGW64)/x86_64-w64-mingw32/include",
- }
configuration { "x64", "mingw-clang", "Release" }
targetdir (_buildDir .. "mingw-clang/bin/x64/Release")