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

Side by Side Diff: third_party/libjingle/libjingle.gyp

Issue 10209008: Roll libjingle 132:133 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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
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 'target_defaults': { 9 'target_defaults': {
10 'defines': [ 10 'defines': [
11 'EXPAT_RELATIVE_PATH',
11 'FEATURE_ENABLE_SSL', 12 'FEATURE_ENABLE_SSL',
12 'FEATURE_ENABLE_VOICEMAIL', # TODO(ncarter): Do we really need this? 13 'GTEST_RELATIVE_PATH',
13 '_USE_32BIT_TIME_T', 14 'HAVE_SRTP',
14 'LOGGING_INSIDE_LIBJINGLE',
15 'EXPAT_RELATIVE_PATH',
16 'JSONCPP_RELATIVE_PATH',
17 'WEBRTC_RELATIVE_PATH',
18 'HAVE_WEBRTC_VIDEO', 15 'HAVE_WEBRTC_VIDEO',
19 'HAVE_WEBRTC_VOICE', 16 'HAVE_WEBRTC_VOICE',
17 'JSONCPP_RELATIVE_PATH',
18 'LOGGING_INSIDE_LIBJINGLE',
20 'NO_SOUND_SYSTEM', 19 'NO_SOUND_SYSTEM',
21 'HAVE_SRTP',
22 'SRTP_RELATIVE_PATH', 20 'SRTP_RELATIVE_PATH',
21 'WEBRTC_RELATIVE_PATH',
22 '_USE_32BIT_TIME_T',
23 ], 23 ],
24 'configurations': { 24 'configurations': {
25 'Debug': { 25 'Debug': {
26 'defines': [ 26 'defines': [
27 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of 27 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
28 # _DEBUG and remove this define. See below as well. 28 # _DEBUG and remove this define. See below as well.
29 '_DEBUG', 29 '_DEBUG',
30 ], 30 ],
31 } 31 }
32 }, 32 },
33 'include_dirs': [ 33 'include_dirs': [
34 './overrides', 34 './overrides',
35 './source', 35 './source',
36 '../../testing/gtest/include',
36 '../../third_party/libyuv/include', 37 '../../third_party/libyuv/include',
37 ], 38 ],
38 'dependencies': [ 39 'dependencies': [
39 '<(DEPTH)/base/base.gyp:base', 40 '<(DEPTH)/base/base.gyp:base',
40 '<(DEPTH)/net/net.gyp:net', 41 '<(DEPTH)/net/net.gyp:net',
41 '<(DEPTH)/third_party/expat/expat.gyp:expat', 42 '<(DEPTH)/third_party/expat/expat.gyp:expat',
42 ], 43 ],
43 'export_dependent_settings': [ 44 'export_dependent_settings': [
44 '<(DEPTH)/third_party/expat/expat.gyp:expat', 45 '<(DEPTH)/third_party/expat/expat.gyp:expat',
45 ], 46 ],
46 'direct_dependent_settings': { 47 'direct_dependent_settings': {
47 'include_dirs': [ 48 'include_dirs': [
48 './overrides', 49 './overrides',
49 './source', 50 './source',
51 '../../testing/gtest/include',
50 ], 52 ],
51 'defines': [ 53 'defines': [
52 'FEATURE_ENABLE_SSL', 54 'FEATURE_ENABLE_SSL',
53 'FEATURE_ENABLE_VOICEMAIL', 55 'FEATURE_ENABLE_VOICEMAIL',
54 'EXPAT_RELATIVE_PATH', 56 'EXPAT_RELATIVE_PATH',
57 'GTEST_RELATIVE_PATH',
55 'JSONCPP_RELATIVE_PATH', 58 'JSONCPP_RELATIVE_PATH',
56 'WEBRTC_RELATIVE_PATH', 59 'WEBRTC_RELATIVE_PATH',
57 'NO_SOUND_SYSTEM', 60 'NO_SOUND_SYSTEM',
58 ], 61 ],
59 'conditions': [ 62 'conditions': [
60 ['OS=="win"', { 63 ['OS=="win"', {
61 'link_settings': { 64 'link_settings': {
62 'libraries': [ 65 'libraries': [
63 '-lsecur32.lib', 66 '-lsecur32.lib',
64 '-lcrypt32.lib', 67 '-lcrypt32.lib',
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_eng ine_core', 626 '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_eng ine_core',
624 '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers. gyp:system_wrappers', 627 '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers. gyp:system_wrappers',
625 'libjingle', 628 'libjingle',
626 'libjingle_p2p', 629 'libjingle_p2p',
627 ], 630 ],
628 }], 631 }],
629 ], 632 ],
630 }, # target libjingle_peerconnection 633 }, # target libjingle_peerconnection
631 ], 634 ],
632 } 635 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698