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

Cleaned up GXS compilation. now single config option (gxs) in .pro file.

Browse source 
Removed GXS headers from p3face.h and used class declarations.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5991 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-12-16 15:04:52 +00:00
parent bfe9271740
commit 7b8bb8dff7
5 changed files with 52 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libretroshare/src/rsserver/p3face-config.cc
View file

@ -42,6 +42,19 @@ const int p3facemsgzone = 11453;
#include "pqi/p3netmgr.h"
// TO SHUTDOWN THREADS.
#ifdef RS_ENABLE_GXS
#include "services/p3idservice.h"
#include "services/p3gxscircles.h"
#include "services/p3wiki.h"
#include "services/p3posted.h"
#include "services/p3photoservice.h"
#include "services/p3gxsforums.h"
#include "services/p3wire.h"
#endif
/****************************************/
/* RsIface Config */
/* Config */
@ -190,6 +203,9 @@ void RsServer::rsGlobalShutDown()
mForums->join();
mChannels->join();
#ifdef RS_ENABLE_GXS
if(mGxsCircles) mGxsCircles->join();
if(mGxsForums) mGxsForums->join();
if(mGxsIdService) mGxsIdService->join();
@ -197,6 +213,7 @@ void RsServer::rsGlobalShutDown()
if(mPhoto) mPhoto->join();
if(mWiki) mWiki->join();
if(mWire) mWire->join();
#endif