Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-24 23:19:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
plugins/Common/retroshare_plugin.pri
View File

@ -10,57 +10,51 @@ linux-g++-64 {
}
win32 {
QMAKE_CC = g++
OBJECTS_DIR = temp/obj
MOC_DIR = temp/moc
RCC_DIR = temp/qrc
UI_DIR = temp/ui
# Switch on extra warnings
QMAKE_CFLAGS += -Wextra
QMAKE_CXXFLAGS += -Wextra
DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW
DEFINES *= MINIUPNPC_VERSION=13
# DESTDIR = lib
OBJECTS_DIR = temp/obj
MOC_DIR = temp/moc
RCC_DIR = temp/qrc
UI_DIR = temp/ui
# Switch off optimization for release version
QMAKE_CXXFLAGS_RELEASE -= -O2
QMAKE_CXXFLAGS_RELEASE += -O0
QMAKE_CFLAGS_RELEASE -= -O2
QMAKE_CFLAGS_RELEASE += -O0
DEFINES += WINDOWS_SYS WIN32 STATICLIB MINGW
DEFINES += MINIUPNPC_VERSION=13
# DESTDIR = lib
# Switch on optimization for debug version
#QMAKE_CXXFLAGS_DEBUG += -O2
#QMAKE_CFLAGS_DEBUG += -O2
# Switch off optimization for release version
QMAKE_CXXFLAGS_RELEASE -= -O2
QMAKE_CXXFLAGS_RELEASE += -O0
QMAKE_CFLAGS_RELEASE -= -O2
QMAKE_CFLAGS_RELEASE += -O0
DEFINES += USE_CMD_ARGS
# Switch on optimization for debug version
#QMAKE_CXXFLAGS_DEBUG += -O2
#QMAKE_CFLAGS_DEBUG += -O2
#miniupnp implementation files
HEADERS += upnp/upnputil.h
SOURCES += upnp/upnputil.c
DEFINES += USE_CMD_ARGS
#miniupnp implementation files
HEADERS += upnp/upnputil.h
SOURCES += upnp/upnputil.c
UPNPC_DIR = ../../../lib/miniupnpc-1.3
GPG_ERROR_DIR = ../../../lib/libgpg-error-1.7
GPGME_DIR = ../../../lib/gpgme-1.1.8
UPNPC_DIR = ../../../lib/miniupnpc-1.3
GPG_ERROR_DIR = ../../../lib/libgpg-error-1.10
GPGME_DIR = ../../../lib/gpgme-1.1.8
PTHREADS_DIR = ../../../lib/pthreads-w32-2-8-0-release
ZLIB_DIR = ../../../lib/zlib-1.2.3
SSL_DIR = ../../../../OpenSSL
PTHREADS_DIR = ../../../lib/pthreads-w32-2-8-0-release
ZLIB_DIR = ../../../lib/zlib-1.2.3
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 += ../../retroshare-gui/src/lib/libretroshare-gui.a
LIBS += -L"../../retroshare-gui/src/lib" -lretroshare-gui
PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a
LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += ../../libbitdht/src/lib/libbitdht.a
PRE_TARGETDEPS *= ../../libbitdht/src/lib/libbitdht.a
LIBS += -L"../../../lib"
LIBS += -lssl -lcrypto -lgpgme -lpthreadGC2d -lminiupnpc -lz
LIBS += -L"../../../lib"
LIBS += -lssl -lcrypto -lgpgme -lpthreadGC2d -lminiupnpc -lz
# added after bitdht
LIBS += -lws2_32
LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32
LIBS += -lole32 -lwinmm
GPG_ERROR_DIR = ../../../lib/libgpg-error-1.7
GPGME_DIR = ../../../lib/gpgme-1.1.8
LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32
LIBS += -lole32 -lwinmm
}

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
#################################### Windows #####################################
win32 {
# Speex
INCLUDEPATH += ../../../speex-1.2rc1/include
}
QMAKE_CXXFLAGS *= -Wall
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);
loaded = false;
inputProcessor = NULL;
inputDevice = NULL;
abSpeech = NULL;
}
AudioInputConfig::~AudioInputConfig()
@ -94,12 +98,9 @@ void AudioInputConfig::load()
//abSpeech->setGeometry(9,20,50,10);
ui.qwVadLayout_2->addWidget(abSpeech,0,0,1,0);
//on_qcbPushClick_clicked(g.s.bPushClick);
//ui.on_Tick_timeout();
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;
Settings->beginGroup(QString("VoipStatistics"));
// Settings->beginGroup(QString("VoipStatistics"));
if (bLoad) {
// load settings
@ -221,7 +221,7 @@ void VoipStatistics::processSettings(bool bLoad)
}
Settings->endGroup();
// Settings->endGroup();
m_bProcessSettings = false;

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

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

7
plugins/plugins.pro
View File

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

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

@ -126,6 +126,9 @@ win32 {
LIBS += -lole32 -lwinmm
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
GPG_ERROR_DIR = ../../../libgpg-error-1.10