diff options
author | Juan Linietsky <reduzio@gmail.com> | 2016-10-30 09:00:45 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2016-10-30 09:00:45 -0300 |
commit | ab4126f51061277e87b41c48b40e7b54942d4eca (patch) | |
tree | c58168b60323c4d43b58743b099e562a89e60a56 /platform/server/detect.py | |
parent | 8b15b26eedad4fdd33d50f5f9aa0fcc1875d503f (diff) | |
parent | 914015f3b63dd956e72ea937d46ea4b2db005ada (diff) | |
download | redot-engine-ab4126f51061277e87b41c48b40e7b54942d4eca.tar.gz |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'platform/server/detect.py')
-rw-r--r-- | platform/server/detect.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/platform/server/detect.py b/platform/server/detect.py index e6fab2043b..ce14100fd0 100644 --- a/platform/server/detect.py +++ b/platform/server/detect.py @@ -27,7 +27,6 @@ def get_opts(): def get_flags(): return [ - ('builtin_zlib', 'no'), ] @@ -39,9 +38,6 @@ def configure(env): env["CC"]="clang" env["CXX"]="clang++" env["LD"]="clang++" - if (env["colored"]=="yes"): - if sys.stdout.isatty(): - env.Append(CXXFLAGS=["-fcolor-diagnostics"]) is64=sys.maxsize > 2**32 |