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

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

Issue 10837131: Update webrtc to 2565. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Update webrtc to 2565. Created 8 years, 4 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
« no previous file with comments | « content/test/webrtc_audio_device_test.cc ('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 'target_defaults': { 9 'target_defaults': {
10 'defines': [ 10 'defines': [
11 'EXPAT_RELATIVE_PATH', 11 'EXPAT_RELATIVE_PATH',
12 'FEATURE_ENABLE_SSL', 12 'FEATURE_ENABLE_SSL',
13 'GTEST_RELATIVE_PATH', 13 'GTEST_RELATIVE_PATH',
14 'HAVE_SRTP', 14 'HAVE_SRTP',
15 'HAVE_WEBRTC_VIDEO', 15 'HAVE_WEBRTC_VIDEO',
16 'HAVE_WEBRTC_VOICE', 16 'HAVE_WEBRTC_VOICE',
17 'JSONCPP_RELATIVE_PATH', 17 'JSONCPP_RELATIVE_PATH',
18 'LOGGING_INSIDE_LIBJINGLE', 18 'LOGGING_INSIDE_LIBJINGLE',
19 'NO_MAIN_THREAD_WRAPPING', 19 'NO_MAIN_THREAD_WRAPPING',
20 'NO_SOUND_SYSTEM', 20 'NO_SOUND_SYSTEM',
21 'SRTP_RELATIVE_PATH', 21 'SRTP_RELATIVE_PATH',
22 'WEBRTC_RELATIVE_PATH',
23 '_USE_32BIT_TIME_T', 22 '_USE_32BIT_TIME_T',
24 ], 23 ],
25 'configurations': { 24 'configurations': {
26 'Debug': { 25 'Debug': {
27 'defines': [ 26 'defines': [
28 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of 27 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
29 # _DEBUG and remove this define. See below as well. 28 # _DEBUG and remove this define. See below as well.
30 '_DEBUG', 29 '_DEBUG',
31 ], 30 ],
32 } 31 }
33 }, 32 },
34 'include_dirs': [ 33 'include_dirs': [
35 './overrides', 34 './overrides',
36 './source', 35 './source',
37 '../../testing/gtest/include', 36 '../../testing/gtest/include',
38 '../../third_party/libyuv/include', 37 '../../third_party/libyuv/include',
38 '../../third_party/webrtc',
39 ], 39 ],
40 'dependencies': [ 40 'dependencies': [
41 '<(DEPTH)/base/base.gyp:base', 41 '<(DEPTH)/base/base.gyp:base',
42 '<(DEPTH)/net/net.gyp:net', 42 '<(DEPTH)/net/net.gyp:net',
43 '<(DEPTH)/third_party/expat/expat.gyp:expat', 43 '<(DEPTH)/third_party/expat/expat.gyp:expat',
44 ], 44 ],
45 'export_dependent_settings': [ 45 'export_dependent_settings': [
46 '<(DEPTH)/third_party/expat/expat.gyp:expat', 46 '<(DEPTH)/third_party/expat/expat.gyp:expat',
47 ], 47 ],
48 'direct_dependent_settings': { 48 'direct_dependent_settings': {
49 'include_dirs': [ 49 'include_dirs': [
50 './overrides', 50 './overrides',
51 './source', 51 './source',
52 '../../testing/gtest/include', 52 '../../testing/gtest/include',
53 '../../third_party/webrtc',
53 ], 54 ],
54 'defines': [ 55 'defines': [
55 'FEATURE_ENABLE_SSL', 56 'FEATURE_ENABLE_SSL',
56 'FEATURE_ENABLE_VOICEMAIL', 57 'FEATURE_ENABLE_VOICEMAIL',
57 'EXPAT_RELATIVE_PATH', 58 'EXPAT_RELATIVE_PATH',
58 'GTEST_RELATIVE_PATH', 59 'GTEST_RELATIVE_PATH',
59 'JSONCPP_RELATIVE_PATH', 60 'JSONCPP_RELATIVE_PATH',
60 'WEBRTC_RELATIVE_PATH',
61 'NO_MAIN_THREAD_WRAPPING', 61 'NO_MAIN_THREAD_WRAPPING',
62 'NO_SOUND_SYSTEM', 62 'NO_SOUND_SYSTEM',
63 ], 63 ],
64 'conditions': [ 64 'conditions': [
65 ['OS=="win"', { 65 ['OS=="win"', {
66 'link_settings': { 66 'link_settings': {
67 'libraries': [ 67 'libraries': [
68 '-lsecur32.lib', 68 '-lsecur32.lib',
69 '-lcrypt32.lib', 69 '-lcrypt32.lib',
70 '-liphlpapi.lib', 70 '-liphlpapi.lib',
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 ], 640 ],
641 'include_dirs': [ 641 'include_dirs': [
642 'source', 642 'source',
643 ], 643 ],
644 'dependencies': [ 644 'dependencies': [
645 'libjingle', 645 'libjingle',
646 ], 646 ],
647 }, # target peerconnection_server 647 }, # target peerconnection_server
648 ], 648 ],
649 } 649 }
OLDNEW
« no previous file with comments | « content/test/webrtc_audio_device_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698