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

fixed up nogui for new rsaccounts stuff.

Browse Source 
added missing OSX make stuff.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7075 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2014-02-01 03:26:26 +00:00
parent 82b50d3b46
commit 7ca3ed78ae
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
retroshare-nogui/src/retroshare-nogui.pro
View File

@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = retroshare-nogui TARGET = retroshare-nogui
CONFIG += bitdht CONFIG += bitdht
#CONFIG += introserver #CONFIG += introserver
CONFIG += sshserver #CONFIG += sshserver
CONFIG -= qt xml gui CONFIG -= qt xml gui
# if you are linking against the libretroshare with gxs. # if you are linking against the libretroshare with gxs.
@ -106,7 +106,20 @@ macx {
# ENABLE THIS OPTION FOR Univeral Binary BUILD. # ENABLE THIS OPTION FOR Univeral Binary BUILD.
# CONFIG += ppc x86 # CONFIG += ppc x86
LIBS += -Wl,-search_paths_first LIBS += -Wl,-search_paths_first
LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2
LIBS += -lssl -lcrypto -lz
LIBS += ../../../miniupnpc-1.0/libminiupnpc.a
LIBS += -framework CoreFoundation
LIBS += -framework Security
gxs {
# We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database.
# LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a
LIBS += ../../../lib/libsqlcipher.a
}
} }
##################################### FreeBSD ###################################### ##################################### FreeBSD ######################################

10
retroshare-nogui/src/retroshare.cc
View File

@ -237,15 +237,7 @@ int main(int argc, char **argv)
RsControl *rsServer = createRsControl(*notify); RsControl *rsServer = createRsControl(*notify);
rsicontrol = rsServer ; rsicontrol = rsServer ;
std::string preferredId, gpgId, gpgName, gpgEmail, sslName; /* PreferredId => Key + Certificate are loaded into libretroshare */
RsInit::getPreferedAccountId(preferredId);
if (RsInit::getAccountDetails(preferredId, gpgId, gpgName, gpgEmail, sslName))
{
RsInit::SelectGPGAccount(gpgId);
}
/* Key + Certificate are loaded into libretroshare */
std::string error_string ; std::string error_string ;
int retVal = RsInit::LockAndLoadCertificates(false,error_string); int retVal = RsInit::LockAndLoadCertificates(false,error_string);