| 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 'libjingle_source%': "source", | 11 'libjingle_source%': "source", |
| 12 'libjingle_peerconnection_additional_deps%': [], | 12 'libjingle_peerconnection_additional_deps%': [], |
| 13 }, | 13 }, |
| 14 'target_defaults': { | 14 'target_defaults': { |
| 15 'defines': [ | 15 'defines': [ |
| 16 'EXPAT_RELATIVE_PATH', | 16 'EXPAT_RELATIVE_PATH', |
| 17 'FEATURE_ENABLE_SSL', | 17 'FEATURE_ENABLE_SSL', |
| 18 'GTEST_RELATIVE_PATH', | 18 'GTEST_RELATIVE_PATH', |
| 19 'HAVE_SRTP', | 19 'HAVE_SRTP', |
| 20 'HAVE_WEBRTC_VIDEO', | 20 'HAVE_WEBRTC_VIDEO', |
| 21 'HAVE_WEBRTC_VOICE', | 21 'HAVE_WEBRTC_VOICE', |
| 22 'JSONCPP_RELATIVE_PATH', | 22 'JSONCPP_RELATIVE_PATH', |
| 23 'LOGGING_INSIDE_LIBJINGLE', | 23 'LOGGING_INSIDE_LIBJINGLE', |
| 24 'NO_MAIN_THREAD_WRAPPING', | 24 'NO_MAIN_THREAD_WRAPPING', |
| 25 'NO_SOUND_SYSTEM', | 25 'NO_SOUND_SYSTEM', |
| 26 'SRTP_RELATIVE_PATH', | 26 'SRTP_RELATIVE_PATH', |
| 27 '_USE_32BIT_TIME_T', | |
| 28 # TODO(ronghuawu): Remove this once libjingle is updated to use the new | 27 # TODO(ronghuawu): Remove this once libjingle is updated to use the new |
| 29 # webrtc. | 28 # webrtc. |
| 30 'USE_WEBRTC_DEV_BRANCH', | 29 'USE_WEBRTC_DEV_BRANCH', |
| 31 ], | 30 ], |
| 32 'configurations': { | 31 'configurations': { |
| 33 'Debug': { | 32 'Debug': { |
| 34 'defines': [ | 33 'defines': [ |
| 35 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of | 34 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of |
| 36 # _DEBUG and remove this define. See below as well. | 35 # _DEBUG and remove this define. See below as well. |
| 37 '_DEBUG', | 36 '_DEBUG', |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 ], | 80 ], |
| 82 }, | 81 }, |
| 83 }], | 82 }], |
| 84 ['OS=="win"', { | 83 ['OS=="win"', { |
| 85 'include_dirs': [ | 84 'include_dirs': [ |
| 86 '../third_party/platformsdk_win7/files/Include', | 85 '../third_party/platformsdk_win7/files/Include', |
| 87 ], | 86 ], |
| 88 'defines': [ | 87 'defines': [ |
| 89 '_CRT_SECURE_NO_WARNINGS', # Suppres warnings about _vsnprinf | 88 '_CRT_SECURE_NO_WARNINGS', # Suppres warnings about _vsnprinf |
| 90 ], | 89 ], |
| 90 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 91 'msvs_disabled_warnings': [ 4267 ], |
| 91 }], | 92 }], |
| 92 ['OS=="linux"', { | 93 ['OS=="linux"', { |
| 93 'defines': [ | 94 'defines': [ |
| 94 'LINUX', | 95 'LINUX', |
| 95 ], | 96 ], |
| 96 }], | 97 }], |
| 97 ['OS=="mac"', { | 98 ['OS=="mac"', { |
| 98 'defines': [ | 99 'defines': [ |
| 99 'OSX', | 100 'OSX', |
| 100 ], | 101 ], |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 '<(DEPTH)/third_party/nss/nss.gyp:nspr', | 163 '<(DEPTH)/third_party/nss/nss.gyp:nspr', |
| 163 '<(DEPTH)/third_party/nss/nss.gyp:nss', | 164 '<(DEPTH)/third_party/nss/nss.gyp:nss', |
| 164 ], | 165 ], |
| 165 }], | 166 }], |
| 166 ], | 167 ], |
| 167 }], | 168 }], |
| 168 ['OS=="win"', { | 169 ['OS=="win"', { |
| 169 'include_dirs': [ | 170 'include_dirs': [ |
| 170 '../third_party/platformsdk_win7/files/Include', | 171 '../third_party/platformsdk_win7/files/Include', |
| 171 ], | 172 ], |
| 173 'conditions' : [ |
| 174 ['target_arch == "ia32"', { |
| 175 'defines': [ |
| 176 '_USE_32BIT_TIME_T', |
| 177 ], |
| 178 }], |
| 179 ], |
| 172 }], | 180 }], |
| 173 ['OS=="linux"', { | 181 ['OS=="linux"', { |
| 174 'defines': [ | 182 'defines': [ |
| 175 'LINUX', | 183 'LINUX', |
| 176 ], | 184 ], |
| 177 }], | 185 }], |
| 178 ['OS=="mac"', { | 186 ['OS=="mac"', { |
| 179 'defines': [ | 187 'defines': [ |
| 180 'OSX', | 188 'OSX', |
| 181 ], | 189 ], |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 412 '<(libjingle_source)/talk/base/win32filesystem.h', | 420 '<(libjingle_source)/talk/base/win32filesystem.h', |
| 413 '<(libjingle_source)/talk/base/win32window.h', | 421 '<(libjingle_source)/talk/base/win32window.h', |
| 414 '<(libjingle_source)/talk/base/win32window.cc', | 422 '<(libjingle_source)/talk/base/win32window.cc', |
| 415 '<(libjingle_source)/talk/base/win32securityerrors.cc', | 423 '<(libjingle_source)/talk/base/win32securityerrors.cc', |
| 416 '<(libjingle_source)/talk/base/winfirewall.cc', | 424 '<(libjingle_source)/talk/base/winfirewall.cc', |
| 417 '<(libjingle_source)/talk/base/winfirewall.h', | 425 '<(libjingle_source)/talk/base/winfirewall.h', |
| 418 '<(libjingle_source)/talk/base/winping.cc', | 426 '<(libjingle_source)/talk/base/winping.cc', |
| 419 '<(libjingle_source)/talk/base/winping.h', | 427 '<(libjingle_source)/talk/base/winping.h', |
| 420 ], | 428 ], |
| 421 # Suppress warnings about WIN32_LEAN_AND_MEAN. | 429 # Suppress warnings about WIN32_LEAN_AND_MEAN. |
| 422 'msvs_disabled_warnings': [ 4005 ], | 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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 '<(libjingle_source)/talk/examples/peerconnection/server/peer_channel.h'
, | 570 '<(libjingle_source)/talk/examples/peerconnection/server/peer_channel.h'
, |
| 563 '<(libjingle_source)/talk/examples/peerconnection/server/utils.cc', | 571 '<(libjingle_source)/talk/examples/peerconnection/server/utils.cc', |
| 564 '<(libjingle_source)/talk/examples/peerconnection/server/utils.h', | 572 '<(libjingle_source)/talk/examples/peerconnection/server/utils.h', |
| 565 ], | 573 ], |
| 566 'include_dirs': [ | 574 'include_dirs': [ |
| 567 '<(libjingle_source)', | 575 '<(libjingle_source)', |
| 568 ], | 576 ], |
| 569 'dependencies': [ | 577 'dependencies': [ |
| 570 'libjingle', | 578 'libjingle', |
| 571 ], | 579 ], |
| 580 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 581 'msvs_disabled_warnings': [ 4309, ], |
| 572 }, # target peerconnection_server | 582 }, # target peerconnection_server |
| 573 ], | 583 ], |
| 574 'conditions': [ | 584 'conditions': [ |
| 575 ['enable_webrtc==1', { | 585 ['enable_webrtc==1', { |
| 576 'targets': [ | 586 'targets': [ |
| 577 { | 587 { |
| 578 'target_name': 'libjingle_peerconnection', | 588 'target_name': 'libjingle_peerconnection', |
| 579 'type': 'static_library', | 589 'type': 'static_library', |
| 580 'sources': [ | 590 'sources': [ |
| 581 '<(libjingle_source)/talk/app/webrtc/audiotrack.cc', | 591 '<(libjingle_source)/talk/app/webrtc/audiotrack.cc', |
| (...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 786 '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.
gyp:system_wrappers', | 796 '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.
gyp:system_wrappers', |
| 787 '<@(libjingle_peerconnection_additional_deps)', | 797 '<@(libjingle_peerconnection_additional_deps)', |
| 788 'libjingle', | 798 'libjingle', |
| 789 'libjingle_p2p', | 799 'libjingle_p2p', |
| 790 ], | 800 ], |
| 791 }, # target libjingle_peerconnection | 801 }, # target libjingle_peerconnection |
| 792 ], | 802 ], |
| 793 }], | 803 }], |
| 794 ], | 804 ], |
| 795 } | 805 } |
| OLD | NEW |