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

Unified Diff: third_party/libjingle/libjingle.gyp

Issue 11818046: Make all jingle targets build on Win64 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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 | « jingle/jingle.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjingle/libjingle.gyp
===================================================================
--- third_party/libjingle/libjingle.gyp (revision 176187)
+++ third_party/libjingle/libjingle.gyp (working copy)
@@ -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': [
« no previous file with comments | « jingle/jingle.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698