Commit a39b3ab9 by Jamie Madill

Fix standalone Linux build.

We can include Makefiles in the ignore list, and need a few extra flags to fix the GCC build on Linux. BUG=angle:563 Change-Id: Iacd386359f0c0d9bb87ddc544dd8b4da2cb8fee0 Reviewed-on: https://chromium-review.googlesource.com/186902Reviewed-by: 's avatarShannon Woods <shannonwoods@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 4df02c1e
...@@ -29,4 +29,6 @@ third_party ...@@ -29,4 +29,6 @@ third_party
tests/third_party tests/third_party
out out
lib/* lib/*
Makefile
*.Makefile
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
'-Wpointer-arith', '-Wpointer-arith',
'-Wundef', '-Wundef',
'-Wwrite-strings', '-Wwrite-strings',
'-Wno-reorder',
'-Wno-format-nonliteral',
], ],
}, },
'target_defaults': 'target_defaults':
......
...@@ -340,7 +340,7 @@ void PrintActiveVariables(ShHandle compiler, ShShaderInfo varType, bool mapLongV ...@@ -340,7 +340,7 @@ void PrintActiveVariables(ShHandle compiler, ShShaderInfo varType, bool mapLongV
case SH_SAMPLER_EXTERNAL_OES: typeName = "GL_SAMPLER_EXTERNAL_OES"; break; case SH_SAMPLER_EXTERNAL_OES: typeName = "GL_SAMPLER_EXTERNAL_OES"; break;
default: assert(0); default: assert(0);
} }
printf("%u: name:%s type:%s size:%d", i, name, typeName, size); printf("%lu: name:%s type:%s size:%d", i, name, typeName, size);
if (mapLongVariableNames) if (mapLongVariableNames)
printf(" mapped name:%s", mappedName); printf(" mapped name:%s", mappedName);
printf("\n"); printf("\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment