diff options
author | 2016-03-11 20:24:20 +0100 | |
---|---|---|
committer | 2016-03-11 20:24:20 +0100 | |
commit | 2bf46f72eddb89a988de6e2adb8190ce328c9ae2 (patch) | |
tree | bb676e7e988dfeda2e407e57e9384ab79617499a /scripts/src | |
parent | d213ae836e012fdae5e556edf16a7e87fe5eeb55 (diff) |
Update to use with latest android nkd (nw)
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/3rdparty.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 80e4b575b80..62262cef282 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -59,7 +59,7 @@ project "zlib" kind "StaticLib" local version = str_to_version(_OPTIONS["gcc_version"]) - if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs")) then + if _OPTIONS["gcc"]~=nil and ((string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android"))) then configuration { "gmake" } if (version >= 30700) then buildoptions { @@ -276,7 +276,7 @@ end "-Wno-unused-function", "-O0", } - if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then + if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android")) then buildoptions { "-Wno-enum-conversion", } |