| Index: runtime/bin/bin.gypi
|
| diff --git a/runtime/bin/bin.gypi b/runtime/bin/bin.gypi
|
| index 4aff04ba8f17e5c509461746ab13aedad2eea18e..5cf40c0b36484306ac15fcbf77ef687d41be55b3 100644
|
| --- a/runtime/bin/bin.gypi
|
| +++ b/runtime/bin/bin.gypi
|
| @@ -225,6 +225,12 @@
|
| 'generate_json_cc_file',
|
| 'generate_uri_cc_file',
|
| 'generate_utf_cc_file',
|
| + 'bin/net/nss.gyp:nss',
|
| + 'bin/net/nss.gyp:nspr',
|
| + 'bin/net/nss.gyp:nssckbi',
|
| + 'bin/net/nss.gyp:nss_static',
|
| + 'bin/net/ssl.gyp:libssl',
|
| + 'bin/net/zlib.gyp:zlib',
|
| ],
|
| 'include_dirs': [
|
| '..',
|
| @@ -240,11 +246,15 @@
|
| 'sources/': [
|
| ['exclude', '_test\\.(cc|h)$'],
|
| ],
|
| + 'defines': [
|
| + 'NSS_USE_STATIC_LIBS=1',
|
| + ],
|
| 'conditions': [
|
| ['OS=="win"', {
|
| - 'sources/' : [
|
| + 'sources/': [
|
| ['exclude', 'fdutils.h'],
|
| ],
|
| +
|
| # TODO(antonm): fix the implementation.
|
| # Current implementation accepts char* strings
|
| # and therefore fails to compile once _UNICODE is
|
| @@ -313,7 +323,7 @@
|
| 'conditions': [
|
| ['OS=="win"', {
|
| 'link_settings': {
|
| - 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
|
| + 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib', '-lwinmm.lib' ],
|
| },
|
| }]],
|
| },
|
| @@ -395,7 +405,7 @@
|
| 'conditions': [
|
| ['OS=="win"', {
|
| 'link_settings': {
|
| - 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
|
| + 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib', '-lwinmm.lib' ],
|
| },
|
| # Generate an import library on Windows, by exporting a function.
|
| # Extensions use this import library to link to the API in dart.exe.
|
| @@ -433,7 +443,7 @@
|
| 'conditions': [
|
| ['OS=="win"', {
|
| 'link_settings': {
|
| - 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
|
| + 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib', '-lwinmm.lib' ],
|
| },
|
| }]],
|
| },
|
| @@ -486,7 +496,7 @@
|
| 'conditions': [
|
| ['OS=="win"', {
|
| 'link_settings': {
|
| - 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
|
| + 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib', '-lwinmm.lib' ],
|
| },
|
| }],
|
| ],
|
|
|