Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 }, | 11 }, |
| 12 'target_defaults': { | 12 'target_defaults': { |
| 13 'defines': [ | 13 'defines': [ |
| 14 'EXPAT_RELATIVE_PATH', | 14 'EXPAT_RELATIVE_PATH', |
| 15 'FEATURE_ENABLE_SSL', | 15 'FEATURE_ENABLE_SSL', |
| 16 'GTEST_RELATIVE_PATH', | 16 'GTEST_RELATIVE_PATH', |
| 17 'HAVE_SRTP', | 17 'HAVE_SRTP', |
| 18 'HAVE_WEBRTC_VIDEO', | 18 'HAVE_WEBRTC_VIDEO', |
| 19 'HAVE_WEBRTC_VOICE', | 19 'HAVE_WEBRTC_VOICE', |
| 20 'JSONCPP_RELATIVE_PATH', | 20 'JSONCPP_RELATIVE_PATH', |
| 21 'LOGGING_INSIDE_LIBJINGLE', | 21 'LOGGING_INSIDE_LIBJINGLE', |
| 22 'NO_MAIN_THREAD_WRAPPING', | 22 'NO_MAIN_THREAD_WRAPPING', |
| 23 'NO_SOUND_SYSTEM', | 23 'NO_SOUND_SYSTEM', |
| 24 'SRTP_RELATIVE_PATH', | 24 'SRTP_RELATIVE_PATH', |
| 25 'SSL_USE_NSS', | |
|
ekr
2012/10/10 23:48:34
Is this what we want? I notice that in sslconfig.h
Ryan Sleevi
2012/10/10 23:59:15
Pretty sure you want this in a 'conditions' block
Ronghua Wu (Left Chromium)
2012/10/11 00:17:18
I don't know exactly what is the purpose of HAVE_O
| |
| 25 '_USE_32BIT_TIME_T', | 26 '_USE_32BIT_TIME_T', |
| 26 ], | 27 ], |
| 27 'configurations': { | 28 'configurations': { |
| 28 'Debug': { | 29 'Debug': { |
| 29 'defines': [ | 30 'defines': [ |
| 30 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of | 31 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of |
| 31 # _DEBUG and remove this define. See below as well. | 32 # _DEBUG and remove this define. See below as well. |
| 32 '_DEBUG', | 33 '_DEBUG', |
| 33 ], | 34 ], |
| 34 } | 35 } |
| 35 }, | 36 }, |
| 36 'include_dirs': [ | 37 'include_dirs': [ |
| 37 './overrides', | 38 './overrides', |
| 38 './source', | 39 './source', |
| 39 '../../testing/gtest/include', | 40 '../../testing/gtest/include', |
| 40 '../../third_party/libyuv/include', | 41 '../../third_party/libyuv/include', |
| 41 '../../third_party/webrtc', | 42 '../../third_party/webrtc', |
| 42 ], | 43 ], |
| 43 'dependencies': [ | 44 'dependencies': [ |
| 44 '<(DEPTH)/base/base.gyp:base', | 45 '<(DEPTH)/base/base.gyp:base', |
| 46 '<(DEPTH)/crypto/crypto.gyp:crypto', | |
|
ekr
2012/10/10 23:48:34
Is this needed now? I guess it will be needed when
Ronghua Wu (Left Chromium)
2012/10/11 00:17:18
This is needed because in the helper.cc, I've adde
| |
| 45 '<(DEPTH)/net/net.gyp:net', | 47 '<(DEPTH)/net/net.gyp:net', |
| 46 '<(DEPTH)/third_party/expat/expat.gyp:expat', | 48 '<(DEPTH)/third_party/expat/expat.gyp:expat', |
| 47 ], | 49 ], |
| 48 'export_dependent_settings': [ | 50 'export_dependent_settings': [ |
| 49 '<(DEPTH)/third_party/expat/expat.gyp:expat', | 51 '<(DEPTH)/third_party/expat/expat.gyp:expat', |
| 50 ], | 52 ], |
| 51 'direct_dependent_settings': { | 53 'direct_dependent_settings': { |
| 52 'include_dirs': [ | 54 'include_dirs': [ |
| 53 './overrides', | 55 './overrides', |
| 54 './source', | 56 './source', |
| (...skipping 651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 706 ], | 708 ], |
| 707 'include_dirs': [ | 709 'include_dirs': [ |
| 708 'source', | 710 'source', |
| 709 ], | 711 ], |
| 710 'dependencies': [ | 712 'dependencies': [ |
| 711 'libjingle', | 713 'libjingle', |
| 712 ], | 714 ], |
| 713 }, # target peerconnection_server | 715 }, # target peerconnection_server |
| 714 ], | 716 ], |
| 715 } | 717 } |
| OLD | NEW |