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

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: Address comments (done). Created 8 years, 2 months 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
Index: runtime/bin/bin.gypi
diff --git a/runtime/bin/bin.gypi b/runtime/bin/bin.gypi
index c851c9757a7383021ec6bb7fdd95b1b5c3cc3edc..5cc6e6b6756360403d3e393d48b8125a1a17ef50 100644
--- a/runtime/bin/bin.gypi
+++ b/runtime/bin/bin.gypi
@@ -275,6 +275,9 @@
'sources/': [
['exclude', '_test\\.(cc|h)$'],
],
+ 'defines': [
+ 'NSS_USE_STATIC_LIBS=1',
+ ],
'conditions': [
['OS=="win"', {
'sources/' : [
@@ -349,7 +352,7 @@
'conditions': [
['OS=="win"', {
'link_settings': {
- 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
+ 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib', '-lwinmm.lib' ],
},
}]],
},
@@ -431,7 +434,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 +473,7 @@
'conditions': [
['OS=="win"', {
'link_settings': {
- 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
+ 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib', '-lwinmm.lib' ],
},
}]],
},
@@ -524,7 +527,7 @@
'conditions': [
['OS=="win"', {
'link_settings': {
- 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
+ 'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib', '-lwinmm.lib' ],
},
}],
],

Powered by Google App Engine
This is Rietveld 408576698