commit 4b167fc8503d8b4887346c5054fc2cc93428846d
author Mike Klein <mtklein@chromium.org> Tue Oct 11 18:13:53 2016 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Oct 11 22:37:40 2016 +0000
tree 4a80583fa480ae981ea9bf3195266c9665dfed54
parent ae7e671f86e9171c98a4b12bd0a0f875c8d6604f

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>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 770d3f2..e3be1c8 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -551,10 +551,16 @@
       "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 @@
         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 (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",