diff options
author | 2016-02-25 12:21:41 +0100 | |
---|---|---|
committer | 2016-02-25 14:58:39 +0100 | |
commit | 4173530610d02ea85e3797bb83d2f8d3ac36111f (patch) | |
tree | faa0bf8d1ab5cfe674ebeb3c451b5ac20cb16899 /scripts/genie.lua | |
parent | 6a9a48a9769309642be7471a01715c21dc295e84 (diff) |
removed nacl, fixed android and pnacl (nw)
Diffstat (limited to 'scripts/genie.lua')
-rw-r--r-- | scripts/genie.lua | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index 4f580dc8afa..a48c9ca24cd 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -955,7 +955,7 @@ end local version = str_to_version(_OPTIONS["gcc_version"]) - if string.find(_OPTIONS["gcc"], "clang") then + if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "pnacl") or string.find(_OPTIONS["gcc"], "asmjs") then if (version < 30400) then print("Clang version 3.4 or later needed") os.exit(-1) @@ -1043,13 +1043,6 @@ configuration { "pnacl" } } archivesplit_size "20" -configuration { "nacl*" } - buildoptions_cpp { - "-x c++", - "-std=c++14", - } - archivesplit_size "20" - configuration { "linux-*" } links { "dl", |