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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« jingle/jingle.gyp ('K') | « jingle/jingle.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'includes': [ 6 'includes': [
7 '../../build/win_precompile.gypi', 7 '../../build/win_precompile.gypi',
8 ], 8 ],
9 'variables': { 9 'variables': {
10 'enabled_libjingle_device_manager%': 0, 10 'enabled_libjingle_device_manager%': 0,
11 'libjingle_source%': "source", 11 'libjingle_source%': "source",
12 'libjingle_peerconnection_additional_deps%': [], 12 'libjingle_peerconnection_additional_deps%': [],
13 '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
13 }, 14 },
14 'target_defaults': { 15 'target_defaults': {
15 'defines': [ 16 'defines': [
16 'EXPAT_RELATIVE_PATH', 17 'EXPAT_RELATIVE_PATH',
17 'FEATURE_ENABLE_SSL', 18 'FEATURE_ENABLE_SSL',
18 'GTEST_RELATIVE_PATH', 19 'GTEST_RELATIVE_PATH',
19 'HAVE_SRTP', 20 'HAVE_SRTP',
20 'HAVE_WEBRTC_VIDEO', 21 'HAVE_WEBRTC_VIDEO',
21 'HAVE_WEBRTC_VOICE', 22 'HAVE_WEBRTC_VOICE',
22 'JSONCPP_RELATIVE_PATH', 23 'JSONCPP_RELATIVE_PATH',
23 'LOGGING_INSIDE_LIBJINGLE', 24 'LOGGING_INSIDE_LIBJINGLE',
24 'NO_MAIN_THREAD_WRAPPING', 25 'NO_MAIN_THREAD_WRAPPING',
25 'NO_SOUND_SYSTEM', 26 'NO_SOUND_SYSTEM',
26 'SRTP_RELATIVE_PATH', 27 'SRTP_RELATIVE_PATH',
27 '_USE_32BIT_TIME_T',
28 # TODO(ronghuawu): Remove this once libjingle is updated to use the new 28 # TODO(ronghuawu): Remove this once libjingle is updated to use the new
29 # webrtc. 29 # webrtc.
30 'USE_WEBRTC_DEV_BRANCH', 30 'USE_WEBRTC_DEV_BRANCH',
31 ], 31 ],
32 'target_conditions': [
33 ['target_arch == "ia32"', {
34 'defines': [
35 '_USE_32BIT_TIME_T',
36 ],
37 }],
38 ],
32 'configurations': { 39 'configurations': {
33 'Debug': { 40 'Debug': {
34 'defines': [ 41 'defines': [
35 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of 42 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
36 # _DEBUG and remove this define. See below as well. 43 # _DEBUG and remove this define. See below as well.
37 '_DEBUG', 44 '_DEBUG',
38 ], 45 ],
39 } 46 }
40 }, 47 },
41 'include_dirs': [ 48 'include_dirs': [
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 '<(libjingle_source)/talk/base/win32filesystem.h', 419 '<(libjingle_source)/talk/base/win32filesystem.h',
413 '<(libjingle_source)/talk/base/win32window.h', 420 '<(libjingle_source)/talk/base/win32window.h',
414 '<(libjingle_source)/talk/base/win32window.cc', 421 '<(libjingle_source)/talk/base/win32window.cc',
415 '<(libjingle_source)/talk/base/win32securityerrors.cc', 422 '<(libjingle_source)/talk/base/win32securityerrors.cc',
416 '<(libjingle_source)/talk/base/winfirewall.cc', 423 '<(libjingle_source)/talk/base/winfirewall.cc',
417 '<(libjingle_source)/talk/base/winfirewall.h', 424 '<(libjingle_source)/talk/base/winfirewall.h',
418 '<(libjingle_source)/talk/base/winping.cc', 425 '<(libjingle_source)/talk/base/winping.cc',
419 '<(libjingle_source)/talk/base/winping.h', 426 '<(libjingle_source)/talk/base/winping.h',
420 ], 427 ],
421 # Suppress warnings about WIN32_LEAN_AND_MEAN. 428 # Suppress warnings about WIN32_LEAN_AND_MEAN.
422 'msvs_disabled_warnings': [ 4005 ], 429 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
430 'msvs_disabled_warnings': [ 4005, 4267 ],
423 }], 431 }],
424 ['os_posix == 1', { 432 ['os_posix == 1', {
425 'sources': [ 433 'sources': [
426 '<(libjingle_source)/talk/base/unixfilesystem.cc', 434 '<(libjingle_source)/talk/base/unixfilesystem.cc',
427 '<(libjingle_source)/talk/base/unixfilesystem.h', 435 '<(libjingle_source)/talk/base/unixfilesystem.h',
428 ], 436 ],
429 }], 437 }],
430 ['OS=="linux"', { 438 ['OS=="linux"', {
431 'sources': [ 439 'sources': [
432 '<(libjingle_source)/talk/base/latebindingsymboltable.cc', 440 '<(libjingle_source)/talk/base/latebindingsymboltable.cc',
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 '<(libjingle_source)/talk/p2p/client/socketmonitor.cc', 551 '<(libjingle_source)/talk/p2p/client/socketmonitor.cc',
544 '<(libjingle_source)/talk/p2p/client/socketmonitor.h', 552 '<(libjingle_source)/talk/p2p/client/socketmonitor.h',
545 '<(libjingle_source)/talk/session/tunnel/pseudotcpchannel.cc', 553 '<(libjingle_source)/talk/session/tunnel/pseudotcpchannel.cc',
546 '<(libjingle_source)/talk/session/tunnel/pseudotcpchannel.h', 554 '<(libjingle_source)/talk/session/tunnel/pseudotcpchannel.h',
547 '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.cc', 555 '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.cc',
548 '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.h', 556 '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.h',
549 ], 557 ],
550 'dependencies': [ 558 'dependencies': [
551 'libjingle', 559 'libjingle',
552 ], 560 ],
561 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
562 'msvs_disabled_warnings': [4267, ],
553 }, # target libjingle_p2p 563 }, # target libjingle_p2p
554 { 564 {
555 'target_name': 'peerconnection_server', 565 'target_name': 'peerconnection_server',
556 'type': 'executable', 566 'type': 'executable',
557 'sources': [ 567 'sources': [
558 '<(libjingle_source)/talk/examples/peerconnection/server/data_socket.cc' , 568 '<(libjingle_source)/talk/examples/peerconnection/server/data_socket.cc' ,
559 '<(libjingle_source)/talk/examples/peerconnection/server/data_socket.h', 569 '<(libjingle_source)/talk/examples/peerconnection/server/data_socket.h',
560 '<(libjingle_source)/talk/examples/peerconnection/server/main.cc', 570 '<(libjingle_source)/talk/examples/peerconnection/server/main.cc',
561 '<(libjingle_source)/talk/examples/peerconnection/server/peer_channel.cc ', 571 '<(libjingle_source)/talk/examples/peerconnection/server/peer_channel.cc ',
562 '<(libjingle_source)/talk/examples/peerconnection/server/peer_channel.h' , 572 '<(libjingle_source)/talk/examples/peerconnection/server/peer_channel.h' ,
563 '<(libjingle_source)/talk/examples/peerconnection/server/utils.cc', 573 '<(libjingle_source)/talk/examples/peerconnection/server/utils.cc',
564 '<(libjingle_source)/talk/examples/peerconnection/server/utils.h', 574 '<(libjingle_source)/talk/examples/peerconnection/server/utils.h',
565 ], 575 ],
566 'include_dirs': [ 576 'include_dirs': [
567 '<(libjingle_source)', 577 '<(libjingle_source)',
568 ], 578 ],
569 'dependencies': [ 579 'dependencies': [
570 'libjingle', 580 'libjingle',
571 ], 581 ],
582 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
583 'msvs_disabled_warnings': [4267, 4309, ],
572 }, # target peerconnection_server 584 }, # target peerconnection_server
573 ], 585 ],
574 'conditions': [ 586 'conditions': [
575 ['enable_webrtc==1', { 587 ['enable_webrtc==1', {
576 'targets': [ 588 'targets': [
577 { 589 {
578 'target_name': 'libjingle_peerconnection', 590 'target_name': 'libjingle_peerconnection',
579 'type': 'static_library', 591 'type': 'static_library',
580 'sources': [ 592 'sources': [
581 '<(libjingle_source)/talk/app/webrtc/audiotrack.cc', 593 '<(libjingle_source)/talk/app/webrtc/audiotrack.cc',
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
781 '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp', 793 '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
782 '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture_modul e', 794 '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture_modul e',
783 '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module ', 795 '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module ',
784 '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_eng ine_core', 796 '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_eng ine_core',
785 '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_eng ine_core', 797 '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_eng ine_core',
786 '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers. gyp:system_wrappers', 798 '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers. gyp:system_wrappers',
787 '<@(libjingle_peerconnection_additional_deps)', 799 '<@(libjingle_peerconnection_additional_deps)',
788 'libjingle', 800 'libjingle',
789 'libjingle_p2p', 801 'libjingle_p2p',
790 ], 802 ],
803 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
804 'msvs_disabled_warnings': [4267, ],
791 }, # target libjingle_peerconnection 805 }, # target libjingle_peerconnection
792 ], 806 ],
793 }], 807 }],
794 ], 808 ],
795 } 809 }
OLDNEW
« jingle/jingle.gyp ('K') | « jingle/jingle.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698