Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-13 08:29:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

clean the qmake files

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2318 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-02-14 14:18:53 +00:00
parent 4435ccf228
commit 94aa902a95
7 changed files with 17 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libretroshare/src/libretroshare.pro
View File

@ -1,15 +1,13 @@
TEMPLATE = lib TEMPLATE = lib
CONFIG += static release CONFIG += staticlib release
TARGET = retroshare TARGET = retroshare
DEFINES -= PQI_USE_XPGP
DEFINES += RS_USE_PGPSSL
profiling { profiling {
QMAKE_CXXFLAGS -= -fomit-frame-pointer QMAKE_CXXFLAGS -= -fomit-frame-pointer
QMAKE_CXXFLAGS *= -pg -g -fno-omit-frame-pointer QMAKE_CXXFLAGS *= -pg -g -fno-omit-frame-pointer
} }
#CONFIG += debug
debug { debug {
# DEFINES *= DEBUG # DEFINES *= DEBUG
# DEFINES *= OPENDHT_DEBUG DHT_DEBUG CONN_DEBUG DEBUG_UDP_SORTER P3DISC_DEBUG DEBUG_UDP_LAYER FT_DEBUG EXTADDRSEARCH_DEBUG # DEFINES *= OPENDHT_DEBUG DHT_DEBUG CONN_DEBUG DEBUG_UDP_SORTER P3DISC_DEBUG DEBUG_UDP_LAYER FT_DEBUG EXTADDRSEARCH_DEBUG
@ -18,7 +16,8 @@ debug {
# DEFINES *= CONN_DEBUG P3DISC_DEBUG RSSERIAL_DEBUG RSITEM_DEBUG DEBUG_PQISSL DEBUG_PQISTREAMER # DEFINES *= CONN_DEBUG P3DISC_DEBUG RSSERIAL_DEBUG RSITEM_DEBUG DEBUG_PQISSL DEBUG_PQISTREAMER
# DEFINES *= NET_DEBUG # DEFINES *= NET_DEBUG
# DEFINES *= DISTRIB_DEBUG # DEFINES *= DISTRIB_DEBUG
QMAKE_CXXFLAGS *= -g QMAKE_CXXFLAGS -= -fomit-frame-pointer
QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer
} }
################################# Linux ########################################## ################################# Linux ##########################################

1
libretroshare/src/pqi/authssl.h
View File

@ -33,7 +33,6 @@
* only the owner ssl cert is store, the rest is jeus callback verification * only the owner ssl cert is store, the rest is jeus callback verification
* *
* To use as an SSL authentication system, you must use a common CA certificate. * To use as an SSL authentication system, you must use a common CA certificate.
* and compilation should be done with PQI_USE_XPGP off, and PQI_USE_SSLONLY on
* * The pqissl stuff doesn't need to differentiate between SSL, SSL + PGP, * * The pqissl stuff doesn't need to differentiate between SSL, SSL + PGP,
* as its X509 certs. * as its X509 certs.
* * The rsserver stuff has to distinguish between all three types ;( * * The rsserver stuff has to distinguish between all three types ;(

7
libretroshare/src/pqi/pqissl.h
View File

@ -40,14 +40,7 @@
#include "pqi/p3connmgr.h" #include "pqi/p3connmgr.h"
/**************** PQI_USE_XPGP ******************/
#if defined(PQI_USE_XPGP)
#include "pqi/authxpgp.h"
#else /* X509 Certificates */
/**************** PQI_USE_XPGP ******************/
#include "pqi/authssl.h" #include "pqi/authssl.h"
#endif /* X509 Certificates */
/**************** PQI_USE_XPGP ******************/
#define WAITING_NOT 0 #define WAITING_NOT 0
#define WAITING_DELAY 1 #define WAITING_DELAY 1

4
libretroshare/src/rsserver/p3peers.cc
View File

@ -36,9 +36,7 @@
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
#ifdef RS_USE_PGPSSL #include <gpgme.h>
#include <gpgme.h>
#endif
const std::string CERT_SSL_ID = "--SSLID--"; const std::string CERT_SSL_ID = "--SSLID--";
const std::string CERT_LOCATION = "--LOCATION--"; const std::string CERT_LOCATION = "--LOCATION--";

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

@ -1,14 +1,20 @@
CONFIG += qt gui uic qrc resources uitools pluginmgr newsettings install_rs CONFIG += qt newsettings install_rs thread release
QT += network xml script opengl #CONFIG += pluginmgr
QT += network xml
TEMPLATE = app TEMPLATE = app
TARGET = RetroShare TARGET = RetroShare
DEFINES *= RS_RELEASE_VERSION DEFINES += RS_RELEASE_VERSION
DEFINES += RS_USE_PGPSSL
RCC_DIR = temp/qrc RCC_DIR = temp/qrc
UI_DIR = temp/ui UI_DIR = temp/ui
MOC_DIR = temp/moc MOC_DIR = temp/moc
#CONFIG += debug
debug {
DEFINES+*= PEERS_DEBUG
QMAKE_CXXFLAGS *= -g
}
################################# Linux ########################################## ################################# Linux ##########################################
# Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib # Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib
linux-* { linux-* {

4
retroshare-gui/src/gui/NetworkDialog.cpp
View File

@ -38,9 +38,7 @@
/* for GPGME */ /* for GPGME */
#include "rsiface/rsinit.h" #include "rsiface/rsinit.h"
#ifdef RS_USE_PGPSSL #include <gpgme.h>
#include <gpgme.h>
#endif
#include <sstream> #include <sstream>

37
retroshare-gui/src/gui/NetworkView.cpp
View File

@ -25,9 +25,7 @@
#include "rsiface/rsinit.h" #include "rsiface/rsinit.h"
#ifdef RS_USE_PGPSSL #include <gpgme.h>
#include <gpgme.h>
#endif
#include <QMenu> #include <QMenu>
#include <QMouseEvent> #include <QMouseEvent>
@ -168,8 +166,6 @@ void NetworkView::insertPeers()
continue; continue;
} }
#ifdef RS_USE_PGPSSL
/* *** */ /* *** */
RsPeerDetails detail; RsPeerDetails detail;
if (!rsPeers->getPeerDetails(*it, detail)) if (!rsPeers->getPeerDetails(*it, detail))
@ -205,37 +201,6 @@ void NetworkView::insertPeers()
} }
ui.graphicsView->addNode(type, *it, detail.name); ui.graphicsView->addNode(type, *it, detail.name);
#else
/* *** */
std::string name = rsPeers->getPeerName(*it);
if (rsPeers->isFriend(*it))
{
type = ELASTIC_NODE_TYPE_FRIEND;
}
else
{
RsPeerDetails detail;
rsPeers->getPeerDetails(*it, detail);
if(detail.trustLvl > RS_TRUST_LVL_MARGINAL)
{
type = ELASTIC_NODE_TYPE_AUTHED;
}
else if (detail.trustLvl >= RS_TRUST_LVL_MARGINAL)
{
type = ELASTIC_NODE_TYPE_MARGINALAUTH;
}
else
{
type = ELASTIC_NODE_TYPE_FOF;
}
}
ui.graphicsView->addNode(type, *it, name);
#endif
std::cerr << "NetworkView::insertPeers() Added Friend: " << *it << std::endl; std::cerr << "NetworkView::insertPeers() Added Friend: " << *it << std::endl;
} }