From 561cfcf18998903dbbfc00672c377c9f4d1f4ac2 Mon Sep 17 00:00:00 2001 From: drbob Date: Sat, 7 Sep 2013 02:55:35 +0000 Subject: [PATCH] Switching on GXS by default. switching rs data directory to ./retroshare6 for the moment. git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6701 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/libretroshare.pro | 2 +- libretroshare/src/rsserver/rsinit.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index 59479a845..3fd616849 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -7,7 +7,7 @@ CONFIG += test_voip #GXS Stuff. # This should be disabled for releases until further notice. -#CONFIG += gxs debug +CONFIG += gxs debug profiling { QMAKE_CXXFLAGS -= -fomit-frame-pointer diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc index 67008f97c..d917cbc2b 100644 --- a/libretroshare/src/rsserver/rsinit.cc +++ b/libretroshare/src/rsserver/rsinit.cc @@ -806,7 +806,7 @@ bool RsInit::setupBaseDir() return false ; } RsInitConfig::basedir = h; - RsInitConfig::basedir += "/.retroshare"; + RsInitConfig::basedir += "/.retroshare6"; #else if (RsInitConfig::portable) { // use directory "Data" in portable version @@ -844,7 +844,7 @@ bool RsInit::setupBaseDir() std::cerr << "Cannot Create BaseConfig Dir" << std::endl; return false ; } - RsInitConfig::basedir += "\\RetroShare"; + RsInitConfig::basedir += "\\RetroShare6"; } #endif /******************************** WINDOWS/UNIX SPECIFIC PART ******************/