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

Tidying up of libretroshare.pro, removed gxs from compilation

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5326 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2012-07-24 18:55:32 +00:00
parent 5fbd591517
commit b2c74a045f
3 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libretroshare/src/gxs/rsgenexchange.cc
View File

@ -2,7 +2,7 @@
RsGenExchange::RsGenExchange(RsGeneralDataService *gds,
RsNetworkExchangeService *ns, RsSerialType *serviceSerialiser)
: mReqMtx("GenExchange"), mDataStore(gds), mNetService(ns), mSerialiser(serviceSerialiser)
: mReqMtx("GenExchange"), mDataStore(gds), mNetService(ns), mSerialiser(serviceSerialiser)
{
mDataAccess = new RsGxsDataAccess(gds);
@ -209,6 +209,7 @@ void RsGenExchange::notifyNewMessages(std::vector<RsNxsMsg *> messages)
bool RsGenExchange::publishGroup(RsGxsGrpItem *grpItem)
{
return false;
}

40
libretroshare/src/libretroshare.pro
View File

@ -1,7 +1,9 @@
TEMPLATE = lib
#CONFIG += staticlib release
#CONFIG += staticlib testnetwork
CONFIG += staticlib bitdht newcache newservices
CONFIG += staticlib bitdht debug newservices
#newcache
#
CONFIG -= qt
TARGET = retroshare
#DEFINES += RSSERIAL_DEBUG
@ -180,7 +182,7 @@ linux-* {
INCLUDEPATH *= /usr/lib/i386-linux-gnu/glib-2.0/include/
DESTDIR = lib
QMAKE_CXXFLAGS *= -Wall -D_FILE_OFFSET_BITS=64
QMAKE_CXXFLAGS *= -Wall -D_FILE_OFFSET_BITS=64 -frtti
QMAKE_CC = g++
SSL_DIR = /usr/include/openssl
@ -658,7 +660,7 @@ SOURCES += zeroconf/p3zeroconf.cc \
}
# new gxs cache system
newcache {
HEADERS += serialiser/rsnxsitems.h \
@ -670,12 +672,19 @@ HEADERS += serialiser/rsnxsitems.h \
gxs/rsgenexchange.h \
gxs/rsnxsobserver.h \
gxs/rsgxsdata.h \
gxs/rstokenservice.h \
gxs/rsgxsdataaccess.h \
retroshare/rsgxsservice.h \
serialiser/rsgxsitems.h
SOURCES += serialiser/rsnxsitems.cc \
gxs/rsdataservice.cc \
gxs/rsgenexchange.cc \
gxs/rsgxsnetservice.cc \
gxs/rsgxsdata.cc
gxs/rsgxsdata.cc \
services/p3photoserviceV2.cc \
gxs/rsgxsdataaccess.cc
}
@ -695,6 +704,9 @@ HEADERS += services/p3photoservice.h \
services/p3forumsv2.h \
retroshare/rsposted.h \
services/p3posted.h \
services/p3photoserviceV2.h \
retroshare/rsphotoV2.h \
SOURCES += services/p3photoservice.cc \
serialiser/rsphotoitems.cc \
@ -709,23 +721,3 @@ SOURCES += services/p3photoservice.cc \
# rsserver/p3photo.cc \
}
# very temporary will restore back
even_newer_cache_modules {
HEADERS += \
serialiser/rsgxsitems.h \
services/p3photoserviceV2.h \
retroshare/rsphotoV2.h \
gxs/rstokenservice.h \
gxs/rsgxsdataaccess.h \
retroshare/rsgxsservice.h
SOURCES += \
services/p3photoserviceV2.cc
SOURCES += \
gxs/rsgxsdataaccess.cpp
}

4
libretroshare/src/serialiser/rsnxsitems.h
View File

@ -35,6 +35,8 @@
#include "serialiser/rstlvtypes.h"
#include "serialiser/rstlvkeys.h"
#include "gxs/rsgxsdata.h"
const uint8_t RS_PKT_SUBTYPE_NXS_SYNC_GRP = 0x0001;
const uint8_t RS_PKT_SUBTYPE_NXS_SYNC_GRP_ITEM = 0x0002;
@ -199,7 +201,7 @@ public:
RsTlvBinaryData meta;
// deserialised metaData, this is not serialised
RsGxsMsgMetaData* metaData;
RsGxsGrpMetaData* metaData;
};
/*!