generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert r7886:7887.

Browse Source 
Broke build steps in other code that uses securetunnelsessionclient.cc
and others.

TBR=tommi@webrtc.org,pthatcher@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/36439004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7890 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2014-12-15 07:03:04 +00:00
parent 40e4767f2b
commit 18a3896bd2
65 changed files with 200 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
talk/libjingle_examples.gyp
View File

@@ -30,6 +30,19 @@
'build/common.gypi',
],
'targets': [
{
'target_name': 'libjingle_xmpphelp',
'type': 'static_library',
'dependencies': [
'<(DEPTH)/third_party/expat/expat.gyp:expat',
'libjingle.gyp:libjingle',
'libjingle.gyp:libjingle_p2p',
],
'sources': [
'<(webrtc_root)/libjingle/xmpp/jingleinfotask.cc',
'<(webrtc_root)/libjingle/xmpp/jingleinfotask.h',
],
}, # target libjingle_xmpphelp
{
'target_name': 'relayserver',
'type': 'executable',
@@ -63,6 +76,16 @@
'examples/turnserver/turnserver_main.cc',
],
}, # target turnserver
{
'target_name': 'login',
'type': 'executable',
'dependencies': [
'libjingle_xmpphelp',
],
'sources': [
'examples/login/login_main.cc',
],
}, # target login
{
'target_name': 'peerconnection_server',
'type': 'executable',
@@ -83,6 +106,56 @@
}, # target peerconnection_server
],
'conditions': [
# TODO(ronghuawu): Reenable building call.
# ['OS!="android"', {
# 'targets': [
# {
# 'target_name': 'call',
# 'type': 'executable',
# 'dependencies': [
# 'libjingle.gyp:libjingle_p2p',
# 'libjingle_xmpphelp',
# ],
# 'sources': [
# 'examples/call/call_main.cc',
# 'examples/call/callclient.cc',
# 'examples/call/callclient.h',
# 'examples/call/console.cc',
# 'examples/call/console.h',
# 'examples/call/friendinvitesendtask.cc',
# 'examples/call/friendinvitesendtask.h',
# 'examples/call/mediaenginefactory.cc',
# 'examples/call/mediaenginefactory.h',
# 'examples/call/muc.h',
# 'examples/call/mucinviterecvtask.cc',
# 'examples/call/mucinviterecvtask.h',
# 'examples/call/mucinvitesendtask.cc',
# 'examples/call/mucinvitesendtask.h',
# 'examples/call/presencepushtask.cc',
# 'examples/call/presencepushtask.h',
# ],
# 'conditions': [
# ['OS=="linux"', {
# 'link_settings': {
# 'libraries': [
# '<!@(pkg-config --libs-only-l gobject-2.0 gthread-2.0'
# ' gtk+-2.0)',
# ],
# },
# }],
# ['OS=="win"', {
# 'msvs_settings': {
# 'VCLinkerTool': {
# 'AdditionalDependencies': [
# 'strmiids.lib',
# ],
# },
# },
# }],
# ], # conditions
# }, # target call
# ], # targets
# }], # OS!="android"
['OS=="linux" or OS=="win"', {
'targets': [
{