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

Merge pull request #179 from sirjenster/osx

Browse Source 
latest OSX patches.
This commit is contained in:
Cyril Soler 2015-11-21 15:08:43 -05:00
commit b2470565c3
8 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libresapi/src/libresapi.pro
View File

@ -32,7 +32,12 @@ libmicrohttpd{
CONFIG += link_pkgconfig
PKGCONFIG *= libmicrohttpd
} else {
LIBS *= -lmicrohttpd
mac {
INCLUDEPATH += /usr/local/include
LIBS *= /usr/local/lib/libmicrohttpd.a
} else {
LIBS *= -lmicrohttpd
}
}
SOURCES += \
api/ApiServerMHD.cpp

8
libretroshare/src/grouter/p3grouter.h
View File

@ -225,7 +225,9 @@ private:
void handleLowLevelTransactionAckItem(RsGRouterTransactionAcknItem*) ;
static Sha1CheckSum computeDataItemHash(RsGRouterGenericDataItem *data_item);
#ifdef __APPLE__
public:
#endif
class nullstream: public std::ostream {};
std::ostream& grouter_debug() const
@ -234,7 +236,9 @@ private:
return _debug_enabled?(std::cerr):null;
}
#ifdef __APPLE__
private:
#endif
void routePendingObjects() ;
void handleTunnels() ;
void autoWash() ;

4
libretroshare/src/libretroshare.pro
View File

@ -274,7 +274,7 @@ mac {
# Beautiful Hack to fix 64bit file access.
QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dfopen64=fopen -Dvstatfs64=vstatfs
UPNPC_DIR = ../../../miniupnpc-1.3
UPNPC_DIR = /usr/local/include
#GPG_ERROR_DIR = ../../../../libgpg-error-1.7
#GPGME_DIR = ../../../../gpgme-1.1.8
@ -283,7 +283,7 @@ mac {
#INCLUDEPATH += . $${UPNPC_DIR} $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src
# We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database.
LIBS += ../../../lib/libsqlcipher.a
LIBS += /usr/local/lib/libsqlcipher.a
#LIBS += -lsqlite3
}

4
libretroshare/src/rsserver/rsinit.cc
View File

@ -365,7 +365,11 @@ int RsInit::InitRetroShare(int argcIgnored, char **argvIgnored, bool strictCheck
#ifdef LOCALNET_TESTING
>> parameter('R',"restrict-port" ,portRestrictions ,"port1-port2","Apply port restriction" ,false)
#endif
#ifdef __APPLE__
>> help('h',"help","Display this Help") ;
#else
>> help() ;
#endif
as.defaultErrorHandling(true) ;

6
libretroshare/src/util/argstream.h
View File

@ -141,9 +141,15 @@ namespace
inline OptionHolder(char s,
const char* l,
const char* desc);
#ifdef __APPLE__
friend OptionHolder help(char s,
const char* l,
const char* desc);
#else
friend OptionHolder help(char s='h',
const char* l="help",
const char* desc="Display this help");
#endif
private:
std::string shortName_;
std::string longName_;

4
retroshare-gui/src/retroshare-gui.pro
View File

@ -212,12 +212,12 @@ macx {
CONFIG += version_detail_bash_script
LIBS += -lssl -lcrypto -lz
#LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error -lassuan
LIBS += ../../../miniupnpc-1.3/libminiupnpc.a
LIBS += /usr/local/lib/libminiupnpc.a
LIBS += -framework CoreFoundation
LIBS += -framework Security
LIBS += -framework Carbon
INCLUDEPATH += . /usr/local/include
DEFINES *= MAC_IDLE # for idle feature
#DEFINES *= MAC_IDLE # for idle feature
CONFIG -= uitools
}

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

@ -96,9 +96,10 @@ macx {
LIBS += -Wl,-search_paths_first
LIBS += -lssl -lcrypto -lz
LIBS += ../../../miniupnpc-1.0/libminiupnpc.a
LIBS += /usr/local/lib/libminiupnpc.a
LIBS += -framework CoreFoundation
LIBS += -framework Security
INCLUDEPATH += /usr/local/include
sshserver {
LIBS += -L../../../lib

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

@ -86,8 +86,11 @@ int main(int argc, char **argv)
// unfinished
//args >> parameter("http-listen", listenAddress, "ipv6 address", "Listen only on the specified address.", false);
args >> option("http-allow-all", allowAllIps, "allow connections from all IP adresses (default= localhost only)");
#ifdef __APPLE__
args >> help('h',"help","Display this Help");
#else
args >> help();
#endif
if (args.helpRequested())
{
std::cerr << args.usage() << std::endl;
@ -99,7 +102,7 @@ int main(int argc, char **argv)
resource_api::ApiServer api;
resource_api::RsControlModule ctrl_mod(argc, argv, api.getStateTokenServer(), &api, true);
api.addResourceHandler("control", dynamic_cast<resource_api::ResourceRouter*>(&ctrl_mod), &resource_api::RsControlModule::handleRequest);
api.addResourceHandler("control", dynamic_cast<resource_api::ResourceRouter*>(&ctrl_mod), &resource_api::RsControlModule::handleRequest);
resource_api::ApiServerMHD* httpd = 0;
if(httpPort != 0)
@ -192,8 +195,11 @@ int main(int argc, char **argv)
>> parameter('P',"ssh-p-hash" ,sshPwdHash ,"hash" ,"Ssh login password hash (Generated by retroshare-nogui -G)",false)
>> parameter('K',"ssh-key-file" ,sshRsaFile ,"RSA key file", "RSA key file for SSH login (not yet implemented).",false )// NOT FINISHED YET.
#ifdef __APPLE__
>> help('h',"help","Display this Help");
#else
>> help() ;
#endif
// Normally argstream would handle this by itself, if we called
// as.defaultErrorHandling() ;
//