Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(338)

Unified Diff: runtime/bin/bin.gypi

Issue 10916081: Add secure sockets to dart:io (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Remove some magic numbers, edit TODOs. Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | runtime/bin/dartutils.h » ('j') | runtime/bin/tls_socket.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/bin.gypi
diff --git a/runtime/bin/bin.gypi b/runtime/bin/bin.gypi
index a96345e2c3bc965043e0ef414dd4161b0ffb00c6..0a05894796aa0640a6445c46e6b6831b6c1b642c 100644
--- a/runtime/bin/bin.gypi
+++ b/runtime/bin/bin.gypi
@@ -276,6 +276,9 @@
'sources/': [
['exclude', '_test\\.(cc|h)$'],
],
+ 'defines': [
+ 'NSS_USE_STATIC_LIBS=1',
+ ],
'conditions': [
['OS=="win"', {
'sources/' : [
@@ -411,7 +414,7 @@
'conditions': [
['OS=="win"', {
'link_settings': {
- 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
+ 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib', '-lwinmm.lib' ],
},
}]],
},
@@ -494,7 +497,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.
@@ -534,7 +537,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.
@@ -596,7 +599,7 @@
'conditions': [
['OS=="win"', {
'link_settings': {
- 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
+ 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib', '-lwinmm.lib' ],
},
}],
],
« no previous file with comments | « no previous file | runtime/bin/dartutils.h » ('j') | runtime/bin/tls_socket.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698