Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-19 11:54:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed linking of the VOIP plugin on Windows.

Browse source 
Exports all symbols from RetroShare.exe and import it in the plugins.
Removed the direct linking of the libretroshare and libbitdht from the plugins.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5003 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-02-28 21:59:01 +00:00
parent 30564fe6ad
commit 96199fabc5
7 changed files with 56 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

24
plugins/Common/retroshare_plugin.pri
View file

@ -10,14 +10,17 @@ linux-g++-64 {
} }
win32 { win32 {
QMAKE_CC = g++ # Switch on extra warnings
QMAKE_CFLAGS += -Wextra
QMAKE_CXXFLAGS += -Wextra
OBJECTS_DIR = temp/obj OBJECTS_DIR = temp/obj
MOC_DIR = temp/moc MOC_DIR = temp/moc
RCC_DIR = temp/qrc RCC_DIR = temp/qrc
UI_DIR = temp/ui UI_DIR = temp/ui
DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW DEFINES += WINDOWS_SYS WIN32 STATICLIB MINGW
DEFINES *= MINIUPNPC_VERSION=13 DEFINES += MINIUPNPC_VERSION=13
# DESTDIR = lib # DESTDIR = lib
# Switch off optimization for release version # Switch off optimization for release version
@ -36,31 +39,22 @@ win32 {
HEADERS += upnp/upnputil.h HEADERS += upnp/upnputil.h
SOURCES += upnp/upnputil.c SOURCES += upnp/upnputil.c
UPNPC_DIR = ../../../lib/miniupnpc-1.3 UPNPC_DIR = ../../../lib/miniupnpc-1.3
GPG_ERROR_DIR = ../../../lib/libgpg-error-1.7 GPG_ERROR_DIR = ../../../lib/libgpg-error-1.10
GPGME_DIR = ../../../lib/gpgme-1.1.8 GPGME_DIR = ../../../lib/gpgme-1.1.8
PTHREADS_DIR = ../../../lib/pthreads-w32-2-8-0-release PTHREADS_DIR = ../../../lib/pthreads-w32-2-8-0-release
ZLIB_DIR = ../../../lib/zlib-1.2.3 ZLIB_DIR = ../../../lib/zlib-1.2.3
SSL_DIR = ../../../../OpenSSL SSL_DIR = ../../../../OpenSSL
INCLUDEPATH += . $${SSL_DIR}/include $${UPNPC_DIR} $${PTHREADS_DIR} $${ZLIB_DIR} $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src INCLUDEPATH += . $${SSL_DIR}/include $${UPNPC_DIR} $${PTHREADS_DIR} $${ZLIB_DIR} $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src
PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a PRE_TARGETDEPS += ../../retroshare-gui/src/lib/libretroshare-gui.a
LIBS += ../../libretroshare/src/lib/libretroshare.a LIBS += -L"../../retroshare-gui/src/lib" -lretroshare-gui
LIBS += ../../libbitdht/src/lib/libbitdht.a
PRE_TARGETDEPS *= ../../libbitdht/src/lib/libbitdht.a
LIBS += -L"../../../lib" LIBS += -L"../../../lib"
LIBS += -lssl -lcrypto -lgpgme -lpthreadGC2d -lminiupnpc -lz LIBS += -lssl -lcrypto -lgpgme -lpthreadGC2d -lminiupnpc -lz
# added after bitdht # added after bitdht
LIBS += -lws2_32
LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32 LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32
LIBS += -lole32 -lwinmm LIBS += -lole32 -lwinmm
GPG_ERROR_DIR = ../../../lib/libgpg-error-1.7
GPGME_DIR = ../../../lib/gpgme-1.1.8
} }

7
plugins/VOIP/VOIP.pro
View file

@ -15,6 +15,13 @@ lessThan(QT_VER_MAJ, 4) | lessThan(QT_VER_MIN, 7) {
INCLUDEPATH += ../../retroshare-gui/src/temp/ui INCLUDEPATH += ../../retroshare-gui/src/temp/ui
#################################### Windows #####################################
win32 {
# Speex
INCLUDEPATH += ../../../speex-1.2rc1/include
}
QMAKE_CXXFLAGS *= -Wall QMAKE_CXXFLAGS *= -Wall
SOURCES = services/p3vors.cc \ SOURCES = services/p3vors.cc \

7
plugins/VOIP/gui/AudioInputConfig.cpp
View file

@ -57,6 +57,10 @@ AudioInputConfig::AudioInputConfig(QWidget * parent, Qt::WFlags flags)
ui.setupUi(this); ui.setupUi(this);
loaded = false; loaded = false;
inputProcessor = NULL;
inputDevice = NULL;
abSpeech = NULL;
} }
AudioInputConfig::~AudioInputConfig() AudioInputConfig::~AudioInputConfig()
@ -94,12 +98,9 @@ void AudioInputConfig::load()
//abSpeech->setGeometry(9,20,50,10); //abSpeech->setGeometry(9,20,50,10);
ui.qwVadLayout_2->addWidget(abSpeech,0,0,1,0); ui.qwVadLayout_2->addWidget(abSpeech,0,0,1,0);
//on_qcbPushClick_clicked(g.s.bPushClick); //on_qcbPushClick_clicked(g.s.bPushClick);
//ui.on_Tick_timeout(); //ui.on_Tick_timeout();
loadSettings(); loadSettings();
inputProcessor = NULL;
inputDevice = NULL;
} }

4
plugins/VOIP/gui/VoipStatistics.cpp
View file

@ -206,7 +206,7 @@ void VoipStatistics::processSettings(bool bLoad)
{ {
m_bProcessSettings = true; m_bProcessSettings = true;
Settings->beginGroup(QString("VoipStatistics")); // Settings->beginGroup(QString("VoipStatistics"));
if (bLoad) { if (bLoad) {
// load settings // load settings
@ -221,7 +221,7 @@ void VoipStatistics::processSettings(bool bLoad)
} }
Settings->endGroup(); // Settings->endGroup();
m_bProcessSettings = false; m_bProcessSettings = false;

3
plugins/VOIP/interface/rsvoip.h
View file

@ -4,6 +4,9 @@
#pragma once #pragma once
#include <stdint.h> #include <stdint.h>
#include <string>
#include <list>
#include <vector>
class RsVoip ; class RsVoip ;
extern RsVoip *rsVoip; extern RsVoip *rsVoip;

7
plugins/plugins.pro
View file

@ -1,8 +1,5 @@
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS += \ SUBDIRS += \
LinksCloud LinksCloud \
VOIP

3
retroshare-gui/src/RetroShare.pro
View file

@ -126,6 +126,9 @@ win32 {
LIBS += -lole32 -lwinmm LIBS += -lole32 -lwinmm
RC_FILE = gui/images/retroshare_win.rc RC_FILE = gui/images/retroshare_win.rc
# export symbols for the plugins
LIBS += -Wl,--export-all-symbols,--out-implib,lib/libretroshare-gui.a
DEFINES += WINDOWS_SYS DEFINES += WINDOWS_SYS
GPG_ERROR_DIR = ../../../libgpg-error-1.10 GPG_ERROR_DIR = ../../../libgpg-error-1.10