diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 15:59:43 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 15:59:43 +0000 |
| commit | 6bb3b558daae88b8adc42a138b48b329b66adac7 (patch) | |
| tree | 9bf3adeefb5bfb46ebc008e8ab0b4f05527dc8a7 /third_party | |
| parent | 00d8e0d40cafa6c3e201537e4f7d85428693a245 (diff) | |
| download | chromium_src-6bb3b558daae88b8adc42a138b48b329b66adac7.zip chromium_src-6bb3b558daae88b8adc42a138b48b329b66adac7.tar.gz chromium_src-6bb3b558daae88b8adc42a138b48b329b66adac7.tar.bz2 | |
Make all jingle targets build on Win64
BUG=166496
BUG=167187
Review URL: https://chromiumcodereview.appspot.com/11818046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 5ded202..8efb866 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -24,7 +24,6 @@ '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', @@ -88,6 +87,8 @@ 'defines': [ '_CRT_SECURE_NO_WARNINGS', # Suppres warnings about _vsnprinf ], + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + 'msvs_disabled_warnings': [ 4267 ], }], ['OS=="linux"', { 'defines': [ @@ -169,6 +170,13 @@ 'include_dirs': [ '../third_party/platformsdk_win7/files/Include', ], + 'conditions' : [ + ['target_arch == "ia32"', { + 'defines': [ + '_USE_32BIT_TIME_T', + ], + }], + ], }], ['OS=="linux"', { 'defines': [ @@ -419,7 +427,7 @@ '<(libjingle_source)/talk/base/winping.h', ], # Suppress warnings about WIN32_LEAN_AND_MEAN. - 'msvs_disabled_warnings': [ 4005 ], + 'msvs_disabled_warnings': [ 4005, 4267 ], }], ['os_posix == 1', { 'sources': [ @@ -569,6 +577,8 @@ 'dependencies': [ 'libjingle', ], + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + 'msvs_disabled_warnings': [ 4309, ], }, # target peerconnection_server ], 'conditions': [ |