| commit | 8f11d4dcafef4447fa68ea0ab28a72589241e9fd | [log] [tgz] |
|---|---|---|
| author | Mike Klein <mtklein@chromium.org> | Wed Jan 24 12:42:55 2018 -0500 |
| committer | Mike Klein <mtklein@chromium.org> | Fri Jan 26 19:52:04 2018 +0000 |
| tree | 0061f498e823a56f25c394d711bdcb0043b1ef9f | |
| parent | 53d57ace9974f04ddde1fa2e3fb6e625ed5ee451 [diff] [blame] |
eliminate SK_BUILD_FOR_WIN32 SK_BUILD_FOR_WIN and SK_BUILD_FOR_WIN32 have long meant the same thing. Chrome fix is https://chromium-review.googlesource.com/c/chromium/src/+/884007 Change-Id: I0e907b1bcd2a358eabf776f414fd3aeb3c689561 Reviewed-on: https://skia-review.googlesource.com/99340 Reviewed-by: Mike Reed <reed@google.com>
diff --git a/samplecode/SampleChineseFling.cpp b/samplecode/SampleChineseFling.cpp index cf14013..ef86747 100644 --- a/samplecode/SampleChineseFling.cpp +++ b/samplecode/SampleChineseFling.cpp
@@ -32,7 +32,7 @@ static sk_sp<SkTypeface> chinese_typeface() { #ifdef SK_BUILD_FOR_ANDROID return MakeResourceAsTypeface("fonts/NotoSansCJK-Regular.ttc"); -#elif defined(SK_BUILD_FOR_WIN32) +#elif defined(SK_BUILD_FOR_WIN) return SkTypeface::MakeFromName("SimSun", SkFontStyle()); #elif defined(SK_BUILD_FOR_MAC) return SkTypeface::MakeFromName("Hiragino Sans GB W3", SkFontStyle());