summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/3rdparty.lua
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /scripts/src/3rdparty.lua
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'scripts/src/3rdparty.lua')
-rw-r--r--scripts/src/3rdparty.lua28
1 files changed, 0 insertions, 28 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 2a31b4ee392..2ccfa749e19 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -633,12 +633,6 @@ end
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
}
- configuration { "vsllvm" }
- buildoptions {
- "-Wno-unused-function",
- "-Wno-enum-conversion",
- }
-
configuration { }
defines {
"WORDS_BIGENDIAN=0",
@@ -976,12 +970,6 @@ end
"SQLITE_OS_WINRT",
}
- configuration { "vsllvm" }
- buildoptions {
- "-Wno-deprecated-declarations",
- "-Wno-unused-variable",
- }
-
configuration { }
files {
@@ -1228,13 +1216,6 @@ project "bgfx"
"/wd4611", -- warning C4611: interaction between '_setjmp' and C++ object destruction is non-portable
"/wd4310", -- warning C4310: cast truncates constant value
}
-
- configuration { "vsllvm" }
- buildoptions {
- "-Wno-unneeded-internal-declaration",
- "-Wno-unused-const-variable",
- }
-
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
"/Qwd906", -- message #906: effect of this "#pragma pack" directive is local to function "xxx"
@@ -1408,15 +1389,6 @@ project "portaudio"
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
}
- configuration { "vsllvm" }
- buildoptions {
- "-Wno-deprecated-declarations",
- "-Wno-missing-braces",
- "-Wno-unused-variable",
- "-Wno-switch",
- "-Wno-unused-function",
- }
-
configuration { "gmake or ninja" }
buildoptions_c {
"-Wno-strict-prototypes",