Chromium Code Reviews| Index: runtime/bin/bin.gypi |
| diff --git a/runtime/bin/bin.gypi b/runtime/bin/bin.gypi |
| index c851c9757a7383021ec6bb7fdd95b1b5c3cc3edc..719d22c27c06d597f91880cfb432b4882eb51045 100644 |
| --- a/runtime/bin/bin.gypi |
| +++ b/runtime/bin/bin.gypi |
| @@ -260,6 +260,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', |
|
Bill Hesse
2012/10/31 16:33:29
Changed to "net" target in bin.gypi.
|
| + 'bin/net/zlib.gyp:zlib', |
| ], |
| 'include_dirs': [ |
| '..', |
| @@ -275,11 +281,15 @@ |
| 'sources/': [ |
| ['exclude', '_test\\.(cc|h)$'], |
| ], |
| + 'defines': [ |
| + 'NSS_USE_STATIC_LIBS=1', |
|
Bill Hesse
2012/10/31 16:33:29
Move to nss.gyp (in)direct dependent settings? Be
|
| + ], |
| '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 |
| @@ -349,7 +359,7 @@ |
| 'conditions': [ |
| ['OS=="win"', { |
| 'link_settings': { |
| - 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ], |
| + 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib', '-lwinmm.lib' ], |
|
Bill Hesse
2012/10/31 16:33:29
Move to nss.gyp direct dependent settings?
|
| }, |
| }]], |
| }, |
| @@ -431,7 +441,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. |
| @@ -470,7 +480,7 @@ |
| 'conditions': [ |
| ['OS=="win"', { |
| 'link_settings': { |
| - 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ], |
| + 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib', '-lwinmm.lib' ], |
| }, |
| }]], |
| }, |
| @@ -524,7 +534,7 @@ |
| 'conditions': [ |
| ['OS=="win"', { |
| 'link_settings': { |
| - 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ], |
| + 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib', '-lwinmm.lib' ], |
| }, |
| }], |
| ], |