Index: third_party/libjingle/libjingle.gyp |
=================================================================== |
--- third_party/libjingle/libjingle.gyp (revision 175573) |
+++ third_party/libjingle/libjingle.gyp (working copy) |
@@ -10,6 +10,7 @@ |
'enabled_libjingle_device_manager%': 0, |
'libjingle_source%': "source", |
'libjingle_peerconnection_additional_deps%': [], |
+ 'target_arch%': "ia32", |
Sergey Ulanov
2013/01/10 02:37:39
Why is this necessary? shouldn't we expect that ta
jschuh
2013/01/10 03:12:15
That's what I thought, but according to the errors
|
}, |
'target_defaults': { |
'defines': [ |
@@ -24,11 +25,17 @@ |
'NO_MAIN_THREAD_WRAPPING', |
'NO_SOUND_SYSTEM', |
'SRTP_RELATIVE_PATH', |
- '_USE_32BIT_TIME_T', |
# TODO(ronghuawu): Remove this once libjingle is updated to use the new |
# webrtc. |
'USE_WEBRTC_DEV_BRANCH', |
], |
+ 'target_conditions': [ |
+ ['target_arch == "ia32"', { |
+ 'defines': [ |
+ '_USE_32BIT_TIME_T', |
+ ], |
+ }], |
+ ], |
'configurations': { |
'Debug': { |
'defines': [ |
@@ -419,7 +426,8 @@ |
'<(libjingle_source)/talk/base/winping.h', |
], |
# Suppress warnings about WIN32_LEAN_AND_MEAN. |
- 'msvs_disabled_warnings': [ 4005 ], |
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
+ 'msvs_disabled_warnings': [ 4005, 4267 ], |
}], |
['os_posix == 1', { |
'sources': [ |
@@ -550,6 +558,8 @@ |
'dependencies': [ |
'libjingle', |
], |
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
+ 'msvs_disabled_warnings': [4267, ], |
}, # target libjingle_p2p |
{ |
'target_name': 'peerconnection_server', |
@@ -569,6 +579,8 @@ |
'dependencies': [ |
'libjingle', |
], |
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
+ 'msvs_disabled_warnings': [4267, 4309, ], |
}, # target peerconnection_server |
], |
'conditions': [ |
@@ -788,6 +800,8 @@ |
'libjingle', |
'libjingle_p2p', |
], |
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
+ 'msvs_disabled_warnings': [4267, ], |
}, # target libjingle_peerconnection |
], |
}], |