diff options
| author |  Mike Klein <mtklein@chromium.org> | 2016-10-11 18:13:53 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-11 22:37:40 +0000 |
| commit | 4b167fc8503d8b4887346c5054fc2cc93428846d (patch) | |
| tree | 4a80583fa480ae981ea9bf3195266c9665dfed54 | |
| parent | ae7e671f86e9171c98a4b12bd0a0f875c8d6604f (diff) | |
GN/Win: everything but skiaserve links.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3240
Change-Id: I85c306f89f3a7faa7f50dadf465122844d015604
Reviewed-on: https://skia-review.googlesource.com/3240
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
| -rw-r--r-- | BUILD.gn | 18 | ||||
| -rw-r--r-- | third_party/expat/BUILD.gn | 1 | ||||
| -rw-r--r-- | third_party/third_party.gni | 3 |
3 files changed, 20 insertions, 2 deletions
@@ -551,10 +551,16 @@ component("skia") { "src/ports/SkTLS_win.cpp", "src/ports/SkTypeface_win_dw.cpp", "src/xps/SkDocument_XPS.cpp", + "src/xps/SkXPSDevice.cpp", ] sources -= [ get_path_info("src/utils/SkThreadUtils_pthread.cpp", "abspath") ] - libs += [ "User32.lib" ] # For SkFontMgr_win_dw.cpp. + libs += [ + "FontSub.lib", + "Ole32.lib", + "OleAut32.lib", + "User32.lib", + ] } else { sources += [ "src/ports/SkOSFile_posix.cpp", @@ -703,6 +709,12 @@ if (skia_enable_tools) { sources += [ "tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp" ] } else if (is_mac) { sources += [ "tools/gpu/gl/mac/CreatePlatformGLTestContext_mac.cpp" ] + } else if (is_win) { + sources += [ "tools/gpu/gl/win/CreatePlatformGLTestContext_win.cpp" ] + libs += [ + "Gdi32.lib", + "OpenGL32.lib", + ] } if (skia_use_angle) { @@ -941,7 +953,9 @@ if (skia_enable_tools) { } } - if (current_cpu != "mipsel") { # Clang 3.8 crashes while compiling hb-icu.cc for mipsel. + # Clang 3.8 crashes while compiling hb-icu.cc for mipsel. + # We can't yet build ICU on Windows. + if (current_cpu != "mipsel" && !is_win) { executable("sktexttopdf-hb") { sources = [ "tools/SkShaper_harfbuzz.cpp", diff --git a/third_party/expat/BUILD.gn b/third_party/expat/BUILD.gn index 1219008c74..b493a210ef 100644 --- a/third_party/expat/BUILD.gn +++ b/third_party/expat/BUILD.gn @@ -9,6 +9,7 @@ declare_args() { import("../third_party.gni") third_party("expat") { + public_defines = [ "XML_STATIC" ] public_include_dirs = [ "../externals/expat/lib" ] defines = [ "HAVE_MEMMOVE" ] diff --git a/third_party/third_party.gni b/third_party/third_party.gni index 37b1e03687..dd9f057665 100644 --- a/third_party/third_party.gni +++ b/third_party/third_party.gni @@ -5,6 +5,9 @@ template("third_party") { config(target_name + "_public") { + if (defined(invoker.public_defines)) { + defines = invoker.public_defines + } include_dirs = invoker.public_include_dirs } source_set(target_name) { |