AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix windows build.

Browse Source 
Windows won't let me insert #ifdefs inside macro expansion.

R=borenet@google.com
TBR=borenet
NOTRY=true

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/289853003

git-svn-id: http://skia.googlecode.com/svn/trunk@14769 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-05-16 18:27:11 +00:00
parent 120c99993e
commit a267d41f27
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dm/DM.cpp
View File

@ -30,12 +30,16 @@ using skiatest::TestRegistry;
DEFINE_int32(threads, -1, "Threads for CPU work. Default NUM_CPUS.");
DEFINE_int32(gpuThreads, 1, "Threads for GPU work.");
#ifdef SK_BUILD_JSON_WRITER
DEFINE_string2(expectations, r, "",
"If a directory, compare generated images against images under this path. "
#ifdef SK_BUILD_JSON_WRITER
"If a file, compare generated images against JSON expectations at this path."
#endif
);
#else
DEFINE_string2(expectations, r, "",
"If a directory, compare generated images against images under this path. "
);
#endif
DEFINE_string2(resources, i, "resources", "Path to resources directory.");
DEFINE_string(match, "", "[~][^]substring[$] [...] of GM name to run.\n"
"Multiple matches may be separated by spaces.\n"