summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-12-03 13:20:30 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-12-03 13:20:57 +0100
commitbb6ca65238c705b43e86d8e817fea2339c7edef6 (patch)
treef49b96617d9cc01c9060e08c6a9642b7afadd1f9 /scripts/src
parent58db9a81d0262c927d5cb43690e9dfecd3d6bf9b (diff)
wrong place (nw)
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua20
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index c1300eac887..7aa54ff84d1 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -58,6 +58,16 @@ project "zlib"
uuid "3d78bd2a-2bd0-4449-8087-42ddfaef7ec9"
kind "StaticLib"
+ local version = str_to_version(_OPTIONS["gcc_version"])
+ if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then
+ configuration { "gmake" }
+ if (version >= 30700) then
+ buildoptions {
+ "-Wno-shift-negative-value",
+ }
+ end
+ end
+
configuration { "vs*" }
buildoptions {
"/wd4131", -- warning C4131: 'xxx' : uses old-style declarator
@@ -296,16 +306,6 @@ project "7z"
uuid "ad573d62-e76a-4b11-ae34-5110a6789a42"
kind "StaticLib"
- local version = str_to_version(_OPTIONS["gcc_version"])
- if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then
- configuration { "gmake" }
- if (version >= 30700) then
- buildoptions {
- "-Wno-shift-negative-value",
- }
- end
- end
-
configuration { "vs*" }
buildoptions {
"/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter