Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 'variables': { | 6 'variables': { |
| 7 'no_libjingle_logging%': 0, | 7 'no_libjingle_logging%': 0, |
| 8 }, | 8 }, |
| 9 'includes': [ | 9 'includes': [ |
| 10 '../../build/win_precompile.gypi', | 10 '../../build/win_precompile.gypi', |
| 11 ], | 11 ], |
| 12 'target_defaults': { | 12 'target_defaults': { |
| 13 'defines': [ | 13 'defines': [ |
| 14 'FEATURE_ENABLE_SSL', | 14 'FEATURE_ENABLE_SSL', |
| 15 'FEATURE_ENABLE_VOICEMAIL', # TODO(ncarter): Do we really need this? | 15 'FEATURE_ENABLE_VOICEMAIL', # TODO(ncarter): Do we really need this? |
| 16 '_USE_32BIT_TIME_T', | 16 '_USE_32BIT_TIME_T', |
| 17 'SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS', | 17 'SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS', |
| 18 'EXPAT_RELATIVE_PATH', | 18 'EXPAT_RELATIVE_PATH', |
| 19 'JSONCPP_RELATIVE_PATH', | |
| 19 'WEBRTC_RELATIVE_PATH', | 20 'WEBRTC_RELATIVE_PATH', |
| 20 'HAVE_WEBRTC_VIDEO', | 21 'HAVE_WEBRTC_VIDEO', |
| 21 'HAVE_WEBRTC_VOICE', | 22 'HAVE_WEBRTC_VOICE', |
| 23 'NO_SOUND_SYSTEM', | |
| 22 ], | 24 ], |
| 23 'configurations': { | 25 'configurations': { |
| 24 'Debug': { | 26 'Debug': { |
| 25 'defines': [ | 27 'defines': [ |
| 26 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of | 28 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of |
| 27 # _DEBUG and remove this define. See below as well. | 29 # _DEBUG and remove this define. See below as well. |
| 28 '_DEBUG', | 30 '_DEBUG', |
| 29 ], | 31 ], |
| 30 } | 32 } |
| 31 }, | 33 }, |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 43 ], | 45 ], |
| 44 'direct_dependent_settings': { | 46 'direct_dependent_settings': { |
| 45 'include_dirs': [ | 47 'include_dirs': [ |
| 46 './overrides', | 48 './overrides', |
| 47 './source', | 49 './source', |
| 48 ], | 50 ], |
| 49 'defines': [ | 51 'defines': [ |
| 50 'FEATURE_ENABLE_SSL', | 52 'FEATURE_ENABLE_SSL', |
| 51 'FEATURE_ENABLE_VOICEMAIL', | 53 'FEATURE_ENABLE_VOICEMAIL', |
| 52 'EXPAT_RELATIVE_PATH', | 54 'EXPAT_RELATIVE_PATH', |
| 55 'JSONCPP_RELATIVE_PATH', | |
| 53 'WEBRTC_RELATIVE_PATH', | 56 'WEBRTC_RELATIVE_PATH', |
| 57 'NO_SOUND_SYSTEM', | |
| 54 ], | 58 ], |
| 55 'conditions': [ | 59 'conditions': [ |
| 56 ['OS=="win"', { | 60 ['OS=="win"', { |
| 57 'link_settings': { | 61 'link_settings': { |
| 58 'libraries': [ | 62 'libraries': [ |
| 59 '-lsecur32.lib', | 63 '-lsecur32.lib', |
| 60 '-lcrypt32.lib', | 64 '-lcrypt32.lib', |
| 61 '-liphlpapi.lib', | 65 '-liphlpapi.lib', |
| 62 ], | 66 ], |
| 63 }, | 67 }, |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 202 'source/talk/base/host.h', | 206 'source/talk/base/host.h', |
| 203 'source/talk/base/httpbase.cc', | 207 'source/talk/base/httpbase.cc', |
| 204 'source/talk/base/httpbase.h', | 208 'source/talk/base/httpbase.h', |
| 205 'source/talk/base/httpclient.h', | 209 'source/talk/base/httpclient.h', |
| 206 'source/talk/base/httpclient.cc', | 210 'source/talk/base/httpclient.cc', |
| 207 'source/talk/base/httpcommon-inl.h', | 211 'source/talk/base/httpcommon-inl.h', |
| 208 'source/talk/base/httpcommon.cc', | 212 'source/talk/base/httpcommon.cc', |
| 209 'source/talk/base/httpcommon.h', | 213 'source/talk/base/httpcommon.h', |
| 210 'source/talk/base/httprequest.cc', | 214 'source/talk/base/httprequest.cc', |
| 211 'source/talk/base/httprequest.h', | 215 'source/talk/base/httprequest.h', |
| 216 'source/talk/base/json.cc', | |
| 217 'source/talk/base/json.h', | |
| 212 'source/talk/base/linked_ptr.h', | 218 'source/talk/base/linked_ptr.h', |
| 213 'source/talk/base/logging.cc', | 219 'source/talk/base/logging.cc', |
| 214 'source/talk/base/md5.h', | 220 'source/talk/base/md5.h', |
| 215 'source/talk/base/md5c.c', | 221 'source/talk/base/md5c.c', |
| 216 'source/talk/base/messagehandler.cc', | 222 'source/talk/base/messagehandler.cc', |
| 217 'source/talk/base/messagehandler.h', | 223 'source/talk/base/messagehandler.h', |
| 218 'source/talk/base/messagequeue.cc', | 224 'source/talk/base/messagequeue.cc', |
| 219 'source/talk/base/messagequeue.h', | 225 'source/talk/base/messagequeue.h', |
| 220 'source/talk/base/nethelpers.cc', | 226 'source/talk/base/nethelpers.cc', |
| 221 'source/talk/base/nethelpers.h', | 227 'source/talk/base/nethelpers.h', |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 266 'source/talk/base/taskparent.cc', | 272 'source/talk/base/taskparent.cc', |
| 267 'source/talk/base/taskparent.h', | 273 'source/talk/base/taskparent.h', |
| 268 'source/talk/base/taskrunner.cc', | 274 'source/talk/base/taskrunner.cc', |
| 269 'source/talk/base/taskrunner.h', | 275 'source/talk/base/taskrunner.h', |
| 270 'source/talk/base/thread.cc', | 276 'source/talk/base/thread.cc', |
| 271 'source/talk/base/thread.h', | 277 'source/talk/base/thread.h', |
| 272 'source/talk/base/time.cc', | 278 'source/talk/base/time.cc', |
| 273 'source/talk/base/time.h', | 279 'source/talk/base/time.h', |
| 274 'source/talk/base/urlencode.cc', | 280 'source/talk/base/urlencode.cc', |
| 275 'source/talk/base/urlencode.h', | 281 'source/talk/base/urlencode.h', |
| 282 'source/talk/base/worker.cc', | |
| 283 'source/talk/base/worker.h', | |
| 276 'source/talk/xmllite/xmlbuilder.cc', | 284 'source/talk/xmllite/xmlbuilder.cc', |
| 277 'source/talk/xmllite/xmlbuilder.h', | 285 'source/talk/xmllite/xmlbuilder.h', |
| 278 'source/talk/xmllite/xmlconstants.cc', | 286 'source/talk/xmllite/xmlconstants.cc', |
| 279 'source/talk/xmllite/xmlconstants.h', | 287 'source/talk/xmllite/xmlconstants.h', |
| 280 'source/talk/xmllite/xmlelement.cc', | 288 'source/talk/xmllite/xmlelement.cc', |
| 281 'source/talk/xmllite/xmlelement.h', | 289 'source/talk/xmllite/xmlelement.h', |
| 282 'source/talk/xmllite/xmlnsstack.cc', | 290 'source/talk/xmllite/xmlnsstack.cc', |
| 283 'source/talk/xmllite/xmlnsstack.h', | 291 'source/talk/xmllite/xmlnsstack.h', |
| 284 'source/talk/xmllite/xmlparser.cc', | 292 'source/talk/xmllite/xmlparser.cc', |
| 285 'source/talk/xmllite/xmlparser.h', | 293 'source/talk/xmllite/xmlparser.h', |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 327 'source/talk/base/win32window.cc', | 335 'source/talk/base/win32window.cc', |
| 328 'source/talk/base/win32securityerrors.cc', | 336 'source/talk/base/win32securityerrors.cc', |
| 329 'source/talk/base/winfirewall.cc', | 337 'source/talk/base/winfirewall.cc', |
| 330 'source/talk/base/winfirewall.h', | 338 'source/talk/base/winfirewall.h', |
| 331 'source/talk/base/winping.cc', | 339 'source/talk/base/winping.cc', |
| 332 'source/talk/base/winping.h', | 340 'source/talk/base/winping.h', |
| 333 ], | 341 ], |
| 334 }], | 342 }], |
| 335 ['os_posix == 1', { | 343 ['os_posix == 1', { |
| 336 'sources': [ | 344 'sources': [ |
| 345 'source/talk/base/latebindingsymboltable.cc', | |
| 346 'source/talk/base/latebindingsymboltable.h', | |
| 337 'source/talk/base/sslstreamadapter.cc', | 347 'source/talk/base/sslstreamadapter.cc', |
| 338 'source/talk/base/sslstreamadapter.h', | 348 'source/talk/base/sslstreamadapter.h', |
| 339 'source/talk/base/unixfilesystem.cc', | 349 'source/talk/base/unixfilesystem.cc', |
| 340 'source/talk/base/unixfilesystem.h', | 350 'source/talk/base/unixfilesystem.h', |
| 341 ], | 351 ], |
| 342 }], | 352 }], |
| 343 ['OS=="linux"', { | 353 ['OS=="linux"', { |
| 344 'sources': [ | 354 'sources': [ |
| 345 'source/talk/base/linux.cc', | 355 'source/talk/base/linux.cc', |
| 346 'source/talk/base/linux.h', | 356 'source/talk/base/linux.h', |
| 347 ], | 357 ], |
| 348 }], | 358 }], |
| 349 ['OS=="mac"', { | 359 ['OS=="mac"', { |
| 350 'sources': [ | 360 'sources': [ |
| 351 'source/talk/base/macconversion.cc', | 361 'source/talk/base/macconversion.cc', |
| 352 'source/talk/base/macconversion.h', | 362 'source/talk/base/macconversion.h', |
| 353 'source/talk/base/macutils.cc', | 363 'source/talk/base/macutils.cc', |
| 354 'source/talk/base/macutils.h', | 364 'source/talk/base/macutils.h', |
| 355 ], | 365 ], |
| 356 }], | 366 }], |
| 357 ], | 367 ], |
| 368 'dependencies': [ | |
| 369 '../jsoncpp/jsoncpp.gyp:jsoncpp', | |
|
Sergey Ulanov
2011/10/24 20:00:46
Please change this and other dependency definition
Ronghua
2011/10/24 21:05:07
Done.
| |
| 370 ], | |
| 358 }, # target libjingle | 371 }, # target libjingle |
| 359 # This has to be is a separate project due to a bug in MSVS: | 372 # This has to be is a separate project due to a bug in MSVS: |
| 360 # https://connect.microsoft.com/VisualStudio/feedback/details/368272/duplica te-cpp-filename-in-c-project-visual-studio-2008 | 373 # https://connect.microsoft.com/VisualStudio/feedback/details/368272/duplica te-cpp-filename-in-c-project-visual-studio-2008 |
| 361 # We have two files named "constants.cc" and MSVS doesn't handle this | 374 # We have two files named "constants.cc" and MSVS doesn't handle this |
| 362 # properly. | 375 # properly. |
| 363 { | 376 { |
| 364 'target_name': 'libjingle_p2p', | 377 'target_name': 'libjingle_p2p', |
| 365 'type': 'static_library', | 378 'type': 'static_library', |
| 366 'sources': [ | 379 'sources': [ |
| 367 'source/talk/p2p/base/candidate.h', | 380 'source/talk/p2p/base/candidate.h', |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 427 ], | 440 ], |
| 428 'dependencies': [ | 441 'dependencies': [ |
| 429 'libjingle', | 442 'libjingle', |
| 430 ], | 443 ], |
| 431 }, # target libjingle_p2p | 444 }, # target libjingle_p2p |
| 432 { | 445 { |
| 433 'target_name': 'libjingle_peerconnection', | 446 'target_name': 'libjingle_peerconnection', |
| 434 'type': 'static_library', | 447 'type': 'static_library', |
| 435 'sources': [ | 448 'sources': [ |
| 436 'source/talk/app/webrtc/peerconnection.h', | 449 'source/talk/app/webrtc/peerconnection.h', |
| 450 'source/talk/app/webrtc/peerconnectionfactory.cc', | |
| 437 'source/talk/app/webrtc/peerconnectionfactory.h', | 451 'source/talk/app/webrtc/peerconnectionfactory.h', |
| 438 'source/talk/app/webrtc/peerconnectionfactory.cc', | 452 'source/talk/app/webrtc/peerconnectionimpl.cc', |
| 453 'source/talk/app/webrtc/peerconnectionimpl.h', | |
| 439 'source/talk/app/webrtc/peerconnectionproxy.cc', | 454 'source/talk/app/webrtc/peerconnectionproxy.cc', |
| 440 'source/talk/app/webrtc/peerconnectionproxy.h', | 455 'source/talk/app/webrtc/peerconnectionproxy.h', |
| 456 'source/talk/app/webrtc/webrtcsession.cc', | |
| 457 'source/talk/app/webrtc/webrtcsession.h', | |
| 458 'source/talk/app/webrtc/webrtcjson.cc', | |
| 459 'source/talk/app/webrtc/webrtcjson.h', | |
| 441 'source/talk/session/phone/audiomonitor.cc', | 460 'source/talk/session/phone/audiomonitor.cc', |
| 442 'source/talk/session/phone/audiomonitor.h', | 461 'source/talk/session/phone/audiomonitor.h', |
| 443 'source/talk/session/phone/call.cc', | 462 'source/talk/session/phone/call.cc', |
| 444 'source/talk/session/phone/call.h', | 463 'source/talk/session/phone/call.h', |
| 445 'source/talk/session/phone/channel.cc', | 464 'source/talk/session/phone/channel.cc', |
| 446 'source/talk/session/phone/channel.h', | 465 'source/talk/session/phone/channel.h', |
| 447 'source/talk/session/phone/channelmanager.cc', | 466 'source/talk/session/phone/channelmanager.cc', |
| 448 'source/talk/session/phone/channelmanager.h', | 467 'source/talk/session/phone/channelmanager.h', |
| 449 'source/talk/session/phone/codec.cc', | 468 'source/talk/session/phone/codec.cc', |
| 450 'source/talk/session/phone/codec.h', | 469 'source/talk/session/phone/codec.h', |
| 451 'source/talk/session/phone/cryptoparams.h', | 470 'source/talk/session/phone/cryptoparams.h', |
| 452 'source/talk/session/phone/currentspeakermonitor.cc', | 471 'source/talk/session/phone/currentspeakermonitor.cc', |
| 453 'source/talk/session/phone/currentspeakermonitor.h', | 472 'source/talk/session/phone/currentspeakermonitor.h', |
| 473 'source/talk/session/phone/devicemanager.cc', | |
| 474 'source/talk/session/phone/devicemanager.h', | |
| 454 'source/talk/session/phone/filemediaengine.cc', | 475 'source/talk/session/phone/filemediaengine.cc', |
| 455 'source/talk/session/phone/filemediaengine.h', | 476 'source/talk/session/phone/filemediaengine.h', |
| 456 'source/talk/session/phone/mediachannel.h', | 477 'source/talk/session/phone/mediachannel.h', |
| 457 'source/talk/session/phone/mediaengine.cc', | 478 'source/talk/session/phone/mediaengine.cc', |
| 458 'source/talk/session/phone/mediaengine.h', | 479 'source/talk/session/phone/mediaengine.h', |
| 459 'source/talk/session/phone/mediamessages.cc', | 480 'source/talk/session/phone/mediamessages.cc', |
| 460 'source/talk/session/phone/mediamessages.h', | 481 'source/talk/session/phone/mediamessages.h', |
| 461 'source/talk/session/phone/mediamonitor.cc', | 482 'source/talk/session/phone/mediamonitor.cc', |
| 462 'source/talk/session/phone/mediamonitor.h', | 483 'source/talk/session/phone/mediamonitor.h', |
| 463 'source/talk/session/phone/mediasession.cc', | 484 'source/talk/session/phone/mediasession.cc', |
| 485 'source/talk/session/phone/mediasession.h', | |
| 464 'source/talk/session/phone/mediasessionclient.cc', | 486 'source/talk/session/phone/mediasessionclient.cc', |
| 465 'source/talk/session/phone/mediasessionclient.h', | 487 'source/talk/session/phone/mediasessionclient.h', |
| 466 'source/talk/session/phone/mediasink.h', | 488 'source/talk/session/phone/mediasink.h', |
| 467 'source/talk/session/phone/rtcpmuxfilter.cc', | 489 'source/talk/session/phone/rtcpmuxfilter.cc', |
| 468 'source/talk/session/phone/rtcpmuxfilter.h', | 490 'source/talk/session/phone/rtcpmuxfilter.h', |
| 469 'source/talk/session/phone/rtpdump.cc', | 491 'source/talk/session/phone/rtpdump.cc', |
| 470 'source/talk/session/phone/rtpdump.h', | 492 'source/talk/session/phone/rtpdump.h', |
| 471 'source/talk/session/phone/rtputils.cc', | 493 'source/talk/session/phone/rtputils.cc', |
| 472 'source/talk/session/phone/rtputils.h', | 494 'source/talk/session/phone/rtputils.h', |
| 473 'source/talk/session/phone/soundclip.cc', | 495 'source/talk/session/phone/soundclip.cc', |
| 474 'source/talk/session/phone/soundclip.h', | 496 'source/talk/session/phone/soundclip.h', |
| 475 'source/talk/session/phone/srtpfilter.cc', | 497 'source/talk/session/phone/srtpfilter.cc', |
| 476 'source/talk/session/phone/srtpfilter.h', | 498 'source/talk/session/phone/srtpfilter.h', |
| 477 'source/talk/session/phone/videocommon.h', | 499 'source/talk/session/phone/videocommon.h', |
| 478 'source/talk/session/phone/voicechannel.h', | 500 'source/talk/session/phone/voicechannel.h', |
| 479 'source/talk/session/phone/webrtccommon.h', | 501 'source/talk/session/phone/webrtccommon.h', |
| 480 'source/talk/session/phone/webrtcpassthroughrender.cc', | 502 'source/talk/session/phone/webrtcpassthroughrender.cc', |
| 503 'source/talk/session/phone/webrtcvideoengine.cc', | |
| 504 'source/talk/session/phone/webrtcvideoengine.h', | |
| 481 'source/talk/session/phone/webrtcvideoframe.cc', | 505 'source/talk/session/phone/webrtcvideoframe.cc', |
| 482 'source/talk/session/phone/webrtcvideoframe.h', | 506 'source/talk/session/phone/webrtcvideoframe.h', |
| 483 'source/talk/session/phone/webrtcvie.h', | 507 'source/talk/session/phone/webrtcvie.h', |
| 484 'source/talk/session/phone/webrtcvoe.h', | 508 'source/talk/session/phone/webrtcvoe.h', |
| 509 'source/talk/session/phone/webrtcvoiceengine.cc', | |
| 510 'source/talk/session/phone/webrtcvoiceengine.h', | |
| 485 ], | 511 ], |
| 486 'dependencies': [ | 512 'dependencies': [ |
| 487 '../../third_party/webrtc/modules/modules.gyp:video_capture_module', | 513 '../jsoncpp/jsoncpp.gyp:jsoncpp', |
|
Sergey Ulanov
2011/10/24 20:00:46
Instead of explicitly specifying this dependency h
Ronghua
2011/10/24 21:05:07
Done.
| |
| 488 '../../third_party/webrtc/modules/modules.gyp:video_render_module', | 514 '../webrtc/modules/modules.gyp:video_capture_module', |
| 489 '../../third_party/webrtc/video_engine/video_engine.gyp:video_engine_cor e', | 515 '../webrtc/modules/modules.gyp:video_render_module', |
| 490 '../../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_cor e', | 516 '../webrtc/video_engine/video_engine.gyp:video_engine_core', |
| 491 '../../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:sys tem_wrappers', | 517 '../webrtc/voice_engine/voice_engine.gyp:voice_engine_core', |
| 518 '../webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers', | |
| 492 'libjingle_p2p', | 519 'libjingle_p2p', |
| 493 ], | 520 ], |
| 494 }, # target libjingle_peerconnection | 521 }, # target libjingle_peerconnection |
| 495 ], | 522 ], |
| 496 } | 523 } |
| OLD | NEW |