commit 2148052ebcba34aa7ba81dcd3db08a953e74c8be
author Mike Klein <mtklein@chromium.org> Wed Oct 12 12:20:25 2016 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Oct 12 16:39:42 2016 +0000
tree c75fad0f61228a379e1a0c9284dcf23dd17e4078
parent 04adfda9c74481d0b640c0ce18864588babfcdf6

GN/Win: everything links on my machine.

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3267

Change-Id: I9879e3e33104a4eea6e5a87573a1b081dcc5ed54
Reviewed-on: https://skia-review.googlesource.com/3267
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>

third_party/libmicrohttpd/BUILD.gn

diff --git a/third_party/libmicrohttpd/BUILD.gn b/third_party/libmicrohttpd/BUILD.gn
index 7780471..1ba07f6 100644
--- a/third_party/libmicrohttpd/BUILD.gn
+++ b/third_party/libmicrohttpd/BUILD.gn
@@ -21,23 +21,27 @@
     "../externals/microhttpd/src/microhttpd/postprocessor.c",
     "../externals/microhttpd/src/microhttpd/reason_phrase.c",
     "../externals/microhttpd/src/microhttpd/response.c",
+    "../externals/microhttpd/src/microhttpd/tsearch.c",
   ]
 
   defines = [ "DAUTH_SUPPORT=1" ]
+  libs = []
 
-  if (!is_win) {
-    defines += [
-      "HAVE_NETINET_IN_H=1",
-      "HAVE_PTHREAD_H=1",
-      "HAVE_SYS_SOCKET_H=1",
-      "MHD_USE_POSIX_THREADS=1",
-    ]
-  } else {
+  if (is_win) {
+    sources += [ "../externals/microhttpd/src/platform/w32functions.c" ]
     defines += [
       "HAVE_SYS_TYPES_H=1",
       "HAVE_TIME_H=1",
       "MHD_USE_W32_THREADS=1",
       "WINDOWS",
     ]
+    libs += [ "Ws2_32.lib" ]
+  } else {
+    defines += [
+      "HAVE_NETINET_IN_H=1",
+      "HAVE_PTHREAD_H=1",
+      "HAVE_SYS_SOCKET_H=1",
+      "MHD_USE_POSIX_THREADS=1",
+    ]
   }
 }