diff options
author | Mike Klein <mtklein@chromium.org> | 2016-11-11 11:39:44 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-11 17:34:36 +0000 |
commit | 38af9438d7b7fa838aff2931d9afb4dd4a82549d (patch) | |
tree | 6e6b5484bf2e6d1bd880eacffd395dd4c55b158d /tools/lua | |
parent | 64dded3d95be625b65120a91ed29dd58112489d3 (diff) |
GN: build Lua tools when skia_use_lua.
When we opt into Lua, this builds SampleLua into SampleApp, and the lua_app and lua_pictures tools.
I've tested this builds with and without skia_use_system_lua on my Mac laptop and Linux desktop.
I've made lua_pictures.cpp's flags static to avoid conflicts with flags in SkCommonFlags.cpp.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4699
DOCS_PREVIEW= https://skia.org/?cl=4699
Change-Id: I8176fd51d8a38746e7d730cfcce66da42b9a015a
Reviewed-on: https://skia-review.googlesource.com/4699
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'tools/lua')
-rw-r--r-- | tools/lua/lua_pictures.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/lua/lua_pictures.cpp b/tools/lua/lua_pictures.cpp index bd8fda1569..68a610ec4b 100644 --- a/tools/lua/lua_pictures.cpp +++ b/tools/lua/lua_pictures.cpp @@ -31,13 +31,13 @@ static const char gSummarizeFunc[] = "sk_scrape_summarize"; // Example usage for the modulo flag: // for i in {0..5}; do lua_pictures --skpPath SKP_PATH -l YOUR_SCRIPT --modulo $i 6 &; done -DEFINE_string(modulo, "", "[--modulo <remainder> <divisor>]: only run tests for which " +static DEFINE_string(modulo, "", "[--modulo <remainder> <divisor>]: only run tests for which " "testIndex %% divisor == remainder."); -DEFINE_string2(skpPath, r, "", "Read this .skp file or .skp files from this dir"); -DEFINE_string2(luaFile, l, "", "File containing lua script to run"); -DEFINE_string2(headCode, s, "", "Optional lua code to call at beginning"); -DEFINE_string2(tailFunc, s, "", "Optional lua function to call at end"); -DEFINE_bool2(quiet, q, false, "Silence all non-error related output"); +static DEFINE_string2(skpPath, r, "", "Read this .skp file or .skp files from this dir"); +static DEFINE_string2(luaFile, l, "", "File containing lua script to run"); +static DEFINE_string2(headCode, s, "", "Optional lua code to call at beginning"); +static DEFINE_string2(tailFunc, s, "", "Optional lua function to call at end"); +static DEFINE_bool2(quiet, q, false, "Silence all non-error related output"); static sk_sp<SkPicture> load_picture(const char path[]) { std::unique_ptr<SkStream> stream = SkStream::MakeFromFile(path); |