Move jingle examples from talk/ into webrtc/libjingle. This is part of the effor to move Jingle out of WebRTC and into its own repository.
R=juberti@webrtc.org, pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/32849004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7936 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pthatcher@webrtc.org
parent
0eb6eec5cb
commit
bc03192560
@ -76,16 +76,6 @@
|
||||
'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',
|
||||
@ -106,56 +96,6 @@
|
||||
}, # 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': [
|
||||
{
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
#include "talk/examples/call/console.h"
|
||||
#include "talk/examples/call/mediaenginefactory.h"
|
||||
#include "webrtc/p2p/base/constants.h"
|
||||
#include "talk/session/media/mediasessionclient.h"
|
||||
#include "webrtc/libjingle/media/mediasessionclient.h"
|
||||
#include "talk/session/media/srtpfilter.h"
|
||||
#include "webrtc/libjingle/xmpp/xmppauth.h"
|
||||
#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
|
||||
@ -53,11 +53,11 @@
|
||||
#include "talk/media/base/videorenderer.h"
|
||||
#include "talk/media/devices/devicemanager.h"
|
||||
#include "talk/media/devices/videorendererfactory.h"
|
||||
#include "webrtc/p2p/base/sessionmanager.h"
|
||||
#include "webrtc/libjingle/session/sessionmanager.h"
|
||||
#include "webrtc/p2p/client/basicportallocator.h"
|
||||
#include "webrtc/p2p/client/sessionmanagertask.h"
|
||||
#include "talk/session/media/mediamessages.h"
|
||||
#include "talk/session/media/mediasessionclient.h"
|
||||
#include "webrtc/libjingle/media/mediamessages.h"
|
||||
#include "webrtc/libjingle/media/mediasessionclient.h"
|
||||
#include "webrtc/libjingle/xmpp/constants.h"
|
||||
#include "webrtc/libjingle/xmpp/hangoutpubsubclient.h"
|
||||
#include "webrtc/libjingle/xmpp/mucroomconfigtask.h"
|
||||
@ -35,8 +35,8 @@
|
||||
#include "talk/examples/call/console.h"
|
||||
#include "talk/media/base/mediachannel.h"
|
||||
#include "webrtc/p2p/base/session.h"
|
||||
#include "talk/session/media/mediamessages.h"
|
||||
#include "talk/session/media/mediasessionclient.h"
|
||||
#include "webrtc/libjingle/media/mediamessages.h"
|
||||
#include "webrtc/libjingle/media/mediasessionclient.h"
|
||||
#include "webrtc/libjingle/xmpp/hangoutpubsubclient.h"
|
||||
#include "webrtc/libjingle/xmpp/presencestatus.h"
|
||||
#include "webrtc/libjingle/xmpp/xmppclient.h"
|
||||
92
webrtc/libjingle/libjingle.gyp
Normal file
92
webrtc/libjingle/libjingle.gyp
Normal file
@ -0,0 +1,92 @@
|
||||
# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
|
||||
#
|
||||
# Use of this source code is governed by a BSD-style license
|
||||
# that can be found in the LICENSE file in the root of the source
|
||||
# tree. An additional intellectual property rights grant can be found
|
||||
# in the file PATENTS. All contributing project authors may
|
||||
# be found in the AUTHORS file in the root of the source tree.
|
||||
|
||||
{
|
||||
'includes': ['../build/common.gypi'],
|
||||
'variables': {
|
||||
'talk_root%': '<(webrtc_root)/../talk',
|
||||
},
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'libjingle_xmpphelp',
|
||||
'type': 'static_library',
|
||||
'dependencies': [
|
||||
'<(DEPTH)/third_party/expat/expat.gyp:expat',
|
||||
'<(talk_root)/libjingle.gyp:libjingle',
|
||||
'<(talk_root)/libjingle.gyp:libjingle_p2p',
|
||||
],
|
||||
'sources': [
|
||||
'xmpp/jingleinfotask.cc',
|
||||
'xmpp/jingleinfotask.h',
|
||||
],
|
||||
}, # target libjingle_xmpphelp
|
||||
{
|
||||
'target_name': 'login',
|
||||
'type': 'executable',
|
||||
'dependencies': [
|
||||
'libjingle_xmpphelp',
|
||||
'<(talk_root)/libjingle.gyp:libjingle',
|
||||
],
|
||||
'sources': [
|
||||
'examples/login/login_main.cc',
|
||||
],
|
||||
}, # target login
|
||||
],
|
||||
'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"
|
||||
],
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user