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
This commit is contained in:
drbob 2013-09-07 02:55:35 +00:00
parent a6cf738371
commit 561cfcf189
2 changed files with 3 additions and 3 deletions

View File

@ -7,7 +7,7 @@ CONFIG += test_voip
#GXS Stuff. #GXS Stuff.
# This should be disabled for releases until further notice. # This should be disabled for releases until further notice.
#CONFIG += gxs debug CONFIG += gxs debug
profiling { profiling {
QMAKE_CXXFLAGS -= -fomit-frame-pointer QMAKE_CXXFLAGS -= -fomit-frame-pointer

View File

@ -806,7 +806,7 @@ bool RsInit::setupBaseDir()
return false ; return false ;
} }
RsInitConfig::basedir = h; RsInitConfig::basedir = h;
RsInitConfig::basedir += "/.retroshare"; RsInitConfig::basedir += "/.retroshare6";
#else #else
if (RsInitConfig::portable) { if (RsInitConfig::portable) {
// use directory "Data" in portable version // use directory "Data" in portable version
@ -844,7 +844,7 @@ bool RsInit::setupBaseDir()
std::cerr << "Cannot Create BaseConfig Dir" << std::endl; std::cerr << "Cannot Create BaseConfig Dir" << std::endl;
return false ; return false ;
} }
RsInitConfig::basedir += "\\RetroShare"; RsInitConfig::basedir += "\\RetroShare6";
} }
#endif #endif
/******************************** WINDOWS/UNIX SPECIFIC PART ******************/ /******************************** WINDOWS/UNIX SPECIFIC PART ******************/