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

Unified Diff: net/net.gyp

Issue 7281018: net: Build net.dll on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 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
« no previous file with comments | « no previous file | net/socket/client_socket_pool_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
===================================================================
--- net/net.gyp (revision 90986)
+++ net/net.gyp (working copy)
@@ -9,7 +9,6 @@
'targets': [
{
'target_name': 'net',
- 'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
@@ -788,6 +787,7 @@
},
],
[ 'OS == "win"', {
+ 'type': '<(component)',
'sources!': [
'http/http_auth_handler_ntlm_portable.cc',
'socket/tcp_client_socket_libevent.cc',
@@ -803,8 +803,8 @@
'third_party/nss/ssl.gyp:ssl',
'tld_cleanup',
],
- },
- { # else: OS != "win"
+ }, { # else: OS != "win"
+ 'type': 'static_library',
'sources!': [
'base/winsock_init.cc',
'base/winsock_init.h',
@@ -815,6 +815,23 @@
],
},
],
+ [ 'OS == "win" and component == "shared_library"', {
+ 'defines': [
+ 'NET_DLL',
+ 'NET_IMPLEMENTATION',
+ ],
+ 'msvs_disabled_warnings': [
+ 4251,
wtc 2011/06/29 23:15:50 Would be nice to add a comment to note what this w
rvargas (doing something else) 2011/06/30 00:22:13 Done.
+ ],
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'NET_DLL',
+ ],
+ 'msvs_disabled_warnings': [
+ 4251,
+ ],
+ },
+ }],
[ 'OS == "mac"', {
'dependencies': [
'../third_party/nss/nss.gyp:nspr',
« no previous file with comments | « no previous file | net/socket/client_socket_pool_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698