From 35f91f5e070f92364354010fb59f05caabc730c7 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Sun, 19 Dec 2010 23:50:46 +0000 Subject: [PATCH] Added some optimizations (const std::string&) to the load of the caches at startup and to the p3ConnectMgr. Added PRE_TARGETDEPS in RetroShare.pro for Windows too. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3923 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/dbase/cachestrapper.cc | 10 +++--- libretroshare/src/pqi/p3connmgr.cc | 42 ++++++++++++------------ libretroshare/src/pqi/p3connmgr.h | 36 ++++++++++---------- libretroshare/src/pqi/pqi_base.h | 2 +- libretroshare/src/pqi/pqistore.cc | 2 +- libretroshare/src/pqi/pqistore.h | 2 +- libretroshare/src/services/p3distrib.cc | 24 +++++++------- libretroshare/src/services/p3distrib.h | 10 +++--- libretroshare/src/services/p3forums.cc | 2 +- retroshare-gui/src/RetroShare.pro | 7 ++-- 10 files changed, 69 insertions(+), 68 deletions(-) diff --git a/libretroshare/src/dbase/cachestrapper.cc b/libretroshare/src/dbase/cachestrapper.cc index 6de9cf9f6..8ddb0d443 100644 --- a/libretroshare/src/dbase/cachestrapper.cc +++ b/libretroshare/src/dbase/cachestrapper.cc @@ -826,6 +826,10 @@ bool CacheStrapper::loadList(std::list& load) std::list remoteCaches; std::string ownId = mConnMgr->getOwnId(); + peerConnectState ownState; + mConnMgr->getOwnNetStatus(ownState); + std::string ownName = ownState.name+" ("+ownState.location+")"; + std::map > saveFiles; std::map >::iterator sit; @@ -844,11 +848,9 @@ bool CacheStrapper::loadList(std::list& load) cd.pid = rscc->pid; - if(cd.pid == mConnMgr->getOwnId()) + if(cd.pid == ownId) { - peerConnectState pca; - mConnMgr->getOwnNetStatus(pca); - cd.pname = pca.name+" ("+pca.location+")"; + cd.pname = ownName; } else { diff --git a/libretroshare/src/pqi/p3connmgr.cc b/libretroshare/src/pqi/p3connmgr.cc index 807aa8b1b..a1f238812 100644 --- a/libretroshare/src/pqi/p3connmgr.cc +++ b/libretroshare/src/pqi/p3connmgr.cc @@ -1498,7 +1498,7 @@ bool p3ConnectMgr::getOwnNetStatus(peerConnectState &state) return true; } -bool p3ConnectMgr::isFriend(std::string id) +bool p3ConnectMgr::isFriend(const std::string &id) { #ifdef CONN_DEBUG std::cerr << "p3ConnectMgr::isFriend(" << id << ") called" << std::endl; @@ -1511,7 +1511,7 @@ bool p3ConnectMgr::isFriend(std::string id) return ret; } -bool p3ConnectMgr::isOnline(std::string id) +bool p3ConnectMgr::isOnline(const std::string &id) { RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/ @@ -1534,12 +1534,12 @@ bool p3ConnectMgr::isOnline(std::string id) return false; } -bool p3ConnectMgr::getFriendNetStatus(std::string id, peerConnectState &state) +bool p3ConnectMgr::getFriendNetStatus(const std::string &id, peerConnectState &state) { RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/ /* check for existing */ - std::map::iterator it; + std::map::iterator it; it = mFriendList.find(id); if (it == mFriendList.end()) { @@ -1551,12 +1551,12 @@ bool p3ConnectMgr::getFriendNetStatus(std::string id, peerConnectState &state) } -bool p3ConnectMgr::getOthersNetStatus(std::string id, peerConnectState &state) +bool p3ConnectMgr::getOthersNetStatus(const std::string &id, peerConnectState &state) { RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/ /* check for existing */ - std::map::iterator it; + std::map::iterator it; it = mOthersList.find(id); if (it == mOthersList.end()) { @@ -1573,7 +1573,7 @@ void p3ConnectMgr::getOnlineList(std::list &peers) RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/ /* check for existing */ - std::map::iterator it; + std::map::iterator it; for(it = mFriendList.begin(); it != mFriendList.end(); it++) { if (it->second.state & RS_PEER_S_CONNECTED) @@ -1681,14 +1681,14 @@ bool p3ConnectMgr::getPeerCount (unsigned int *pnFriendCount, unsigned int *pnOn } -bool p3ConnectMgr::connectAttempt(std::string id, struct sockaddr_in &addr, +bool p3ConnectMgr::connectAttempt(const std::string &id, struct sockaddr_in &addr, uint32_t &delay, uint32_t &period, uint32_t &type) { RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/ /* check for existing */ - std::map::iterator it; + std::map::iterator it; it = mFriendList.find(id); if (it == mFriendList.end()) { @@ -1751,7 +1751,7 @@ bool p3ConnectMgr::connectAttempt(std::string id, struct sockaddr_in &addr, * */ -bool p3ConnectMgr::connectResult(std::string id, bool success, uint32_t flags, struct sockaddr_in remote_peer_address) +bool p3ConnectMgr::connectResult(const std::string &id, bool success, uint32_t flags, struct sockaddr_in remote_peer_address) { bool should_netAssistFriend_false = false ; bool should_netAssistFriend_true = false ; @@ -2174,7 +2174,7 @@ void p3ConnectMgr::peerConnectRequest(std::string id, struct sockaddr_in radd /*******************************************************************/ /*******************************************************************/ -bool p3ConnectMgr::addFriend(std::string id, std::string gpg_id, uint32_t netMode, uint32_t visState, time_t lastContact) +bool p3ConnectMgr::addFriend(const std::string &id, const std::string &gpg_id, uint32_t netMode, uint32_t visState, time_t lastContact) { bool should_netAssistFriend_true = false ; bool should_netAssistFriend_false = false ; @@ -2300,7 +2300,7 @@ bool p3ConnectMgr::addFriend(std::string id, std::string gpg_id, uint32_t netMod } -bool p3ConnectMgr::removeFriend(std::string id) +bool p3ConnectMgr::removeFriend(const std::string &id) { #ifdef CONN_DEBUG @@ -2432,7 +2432,7 @@ bool p3ConnectMgr::addNeighbour(std::string id) /*******************************************************************/ /*******************************************************************/ /*************** External Control ****************/ -bool p3ConnectMgr::retryConnect(std::string id) +bool p3ConnectMgr::retryConnect(const std::string &id) { /* push all available addresses onto the connect addr stack */ #ifdef CONN_DEBUG @@ -2450,7 +2450,7 @@ bool p3ConnectMgr::retryConnect(std::string id) -bool p3ConnectMgr::retryConnectUDP(std::string id, struct sockaddr_in &rUdpAddr) +bool p3ConnectMgr::retryConnectUDP(const std::string &id, struct sockaddr_in &rUdpAddr) { RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/ @@ -2521,7 +2521,7 @@ bool p3ConnectMgr::retryConnectUDP(std::string id, struct sockaddr_in &rUdpAdd -bool p3ConnectMgr::retryConnectTCP(std::string id) +bool p3ConnectMgr::retryConnectTCP(const std::string &id) { RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/ @@ -2918,7 +2918,7 @@ bool p3ConnectMgr::locked_ConnectAttempt_Complete(peerConnectState *peer) **********************************************************************/ -bool p3ConnectMgr::setLocalAddress(std::string id, struct sockaddr_in addr) +bool p3ConnectMgr::setLocalAddress(const std::string &id, struct sockaddr_in addr) { if (id == AuthSSL::getAuthSSL()->OwnId()) { @@ -2975,7 +2975,7 @@ bool p3ConnectMgr::setLocalAddress(std::string id, struct sockaddr_in addr) return true; } -bool p3ConnectMgr::setExtAddress(std::string id, struct sockaddr_in addr) +bool p3ConnectMgr::setExtAddress(const std::string &id, struct sockaddr_in addr) { if (id == AuthSSL::getAuthSSL()->OwnId()) { @@ -3015,7 +3015,7 @@ bool p3ConnectMgr::setExtAddress(std::string id, struct sockaddr_in addr) } -bool p3ConnectMgr::setDynDNS(std::string id, std::string dyndns) +bool p3ConnectMgr::setDynDNS(const std::string &id, const std::string &dyndns) { if (id == AuthSSL::getAuthSSL()->OwnId()) { @@ -3088,7 +3088,7 @@ bool p3ConnectMgr::updateAddressList(const std::string& id, const pqiIpAddrSe return true; } -bool p3ConnectMgr::setNetworkMode(std::string id, uint32_t netMode) +bool p3ConnectMgr::setNetworkMode(const std::string &id, uint32_t netMode) { if (id == AuthSSL::getAuthSSL()->OwnId()) { @@ -3129,7 +3129,7 @@ bool p3ConnectMgr::setNetworkMode(std::string id, uint32_t netMode) return false; } -bool p3ConnectMgr::setLocation(std::string id, std::string location) +bool p3ConnectMgr::setLocation(const std::string &id, const std::string &location) { RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/ @@ -3152,7 +3152,7 @@ bool p3ConnectMgr::setLocation(std::string id, std::string location) } } -bool p3ConnectMgr::setVisState(std::string id, uint32_t visState) +bool p3ConnectMgr::setVisState(const std::string &id, uint32_t visState) { if (id == AuthSSL::getAuthSSL()->OwnId()) { diff --git a/libretroshare/src/pqi/p3connmgr.h b/libretroshare/src/pqi/p3connmgr.h index 59141bc46..943be55cb 100644 --- a/libretroshare/src/pqi/p3connmgr.h +++ b/libretroshare/src/pqi/p3connmgr.h @@ -229,7 +229,7 @@ bool checkNetAddress(); /* check our address is sensible */ /*************** External Control ****************/ bool shutdown(); /* blocking shutdown call */ -bool retryConnect(std::string id); +bool retryConnect(const std::string &id); bool getUPnPState(); bool getUPnPEnabled(); @@ -254,22 +254,22 @@ bool getExtFinderAddress(struct sockaddr_in &addr); void getNetStatus(pqiNetStatus &status); void setOwnNetConfig(uint32_t netMode, uint32_t visState); -bool setLocalAddress(std::string id, struct sockaddr_in addr); -bool setExtAddress(std::string id, struct sockaddr_in addr); -bool setDynDNS(std::string id, std::string dyndns); +bool setLocalAddress(const std::string &id, struct sockaddr_in addr); +bool setExtAddress(const std::string &id, struct sockaddr_in addr); +bool setDynDNS(const std::string &id, const std::string &dyndns); bool updateAddressList(const std::string& id, const pqiIpAddrSet &addrs); -bool setNetworkMode(std::string id, uint32_t netMode); -bool setVisState(std::string id, uint32_t visState); +bool setNetworkMode(const std::string &id, uint32_t netMode); +bool setVisState(const std::string &id, uint32_t visState); -bool setLocation(std::string pid, std::string location);//location is shown in the gui to differentiate ssl certs +bool setLocation(const std::string &pid, const std::string &location);//location is shown in the gui to differentiate ssl certs /* add/remove friends */ -bool addFriend(std::string ssl_id, std::string gpg_id, uint32_t netMode = RS_NET_MODE_UDP, +bool addFriend(const std::string &ssl_id, const std::string &gpg_id, uint32_t netMode = RS_NET_MODE_UDP, uint32_t visState = RS_VIS_STATE_STD , time_t lastContact = 0); -bool removeFriend(std::string ssl_id); -bool addNeighbour(std::string); +bool removeFriend(const std::string &ssl_id); +bool addNeighbour(const std::string&); /*************** External Control ****************/ @@ -277,10 +277,10 @@ bool addNeighbour(std::string); const std::string getOwnId(); bool getOwnNetStatus(peerConnectState &state); -bool isFriend(std::string ssl_id); -bool isOnline(std::string ssl_id); -bool getFriendNetStatus(std::string id, peerConnectState &state); -bool getOthersNetStatus(std::string id, peerConnectState &state); +bool isFriend(const std::string &ssl_id); +bool isOnline(const std::string &ssl_id); +bool getFriendNetStatus(const std::string &id, peerConnectState &state); +bool getOthersNetStatus(const std::string &id, peerConnectState &state); void getOnlineList(std::list &ssl_peers); void getFriendList(std::list &ssl_peers); @@ -300,9 +300,9 @@ virtual void peerConnectRequest(std::string id, //virtual void stunStatus(std::string id, struct sockaddr_in raddr, uint32_t type, uint32_t flags); /****************** Connections *******************/ -bool connectAttempt(std::string id, struct sockaddr_in &addr, +bool connectAttempt(const std::string &id, struct sockaddr_in &addr, uint32_t &delay, uint32_t &period, uint32_t &type); -bool connectResult(std::string id, bool success, uint32_t flags, struct sockaddr_in remote_peer_address); +bool connectResult(const std::string &id, bool success, uint32_t flags, struct sockaddr_in remote_peer_address); /******************** Groups **********************/ bool addGroup(RsGroupInfo &groupInfo); @@ -368,10 +368,10 @@ void networkConsistencyCheck(); void tickMonitors(); /* connect attempts UDP */ -bool retryConnectUDP(std::string id, struct sockaddr_in &rUdpAddr); +bool retryConnectUDP(const std::string &id, struct sockaddr_in &rUdpAddr); /* connect attempts TCP */ -bool retryConnectTCP(std::string id); +bool retryConnectTCP(const std::string &id); void locked_ConnectAttempt_CurrentAddresses(peerConnectState *peer); void locked_ConnectAttempt_HistoricalAddresses(peerConnectState *peer); diff --git a/libretroshare/src/pqi/pqi_base.h b/libretroshare/src/pqi/pqi_base.h index f4168f00e..21b21f1b6 100644 --- a/libretroshare/src/pqi/pqi_base.h +++ b/libretroshare/src/pqi/pqi_base.h @@ -111,7 +111,7 @@ class NetInterface; class PQInterface: public RateInterface { public: - PQInterface(std::string id) :peerId(id) { return; } + PQInterface(const std::string &id) :peerId(id) { return; } virtual ~PQInterface() { return; } /*! diff --git a/libretroshare/src/pqi/pqistore.cc b/libretroshare/src/pqi/pqistore.cc index 13f79c4a9..8002eac8e 100644 --- a/libretroshare/src/pqi/pqistore.cc +++ b/libretroshare/src/pqi/pqistore.cc @@ -50,7 +50,7 @@ const int pqistorezone = 9511; -pqistore::pqistore(RsSerialiser *rss, std::string srcId, BinInterface *bio_in, int bio_flags_in) +pqistore::pqistore(RsSerialiser *rss, const std::string &srcId, BinInterface *bio_in, int bio_flags_in) :PQInterface(""), rsSerialiser(rss), bio(bio_in), bio_flags(bio_flags_in), nextPkt(NULL), mSrcId(srcId) { diff --git a/libretroshare/src/pqi/pqistore.h b/libretroshare/src/pqi/pqistore.h index 41a7cfa34..0e1bc400c 100644 --- a/libretroshare/src/pqi/pqistore.h +++ b/libretroshare/src/pqi/pqistore.h @@ -41,7 +41,7 @@ class pqistore: public PQInterface { public: - pqistore(RsSerialiser *rss, std::string srcId, BinInterface *bio_in, int bio_flagsin); + pqistore(RsSerialiser *rss, const std::string &srcId, BinInterface *bio_in, int bio_flagsin); virtual ~pqistore(); // PQInterface diff --git a/libretroshare/src/services/p3distrib.cc b/libretroshare/src/services/p3distrib.cc index eeb65f612..cad4da7e7 100644 --- a/libretroshare/src/services/p3distrib.cc +++ b/libretroshare/src/services/p3distrib.cc @@ -233,7 +233,7 @@ bool p3GroupDistrib::loadLocalCache(const CacheData &data) /* No need for special treatment for 'own' groups. * configuration should be loaded before cache files. */ -void p3GroupDistrib::loadFileGroups(std::string filename, std::string src, bool local) +void p3GroupDistrib::loadFileGroups(const std::string &filename, const std::string &src, bool local) { #ifdef DISTRIB_DEBUG std::cerr << "p3GroupDistrib::loadFileGroups()"; @@ -292,7 +292,7 @@ void p3GroupDistrib::loadFileGroups(std::string filename, std::string src, bool } -void p3GroupDistrib::loadFileMsgs(std::string filename, uint16_t cacheSubId, std::string src, uint32_t ts, bool local) +void p3GroupDistrib::loadFileMsgs(const std::string &filename, uint16_t cacheSubId, const std::string &src, uint32_t ts, bool local) { #ifdef DISTRIB_DEBUG @@ -384,8 +384,8 @@ void p3GroupDistrib::loadFileMsgs(std::string filename, uint16_t cacheSubId, std void p3GroupDistrib::loadGroup(RsDistribGrp *newGrp) { /* load groupInfo */ - std::string gid = newGrp -> grpId; - std::string pid = newGrp -> PeerId(); + const std::string &gid = newGrp -> grpId; + const std::string &pid = newGrp -> PeerId(); #ifdef DISTRIB_DEBUG std::cerr << "p3GroupDistrib::loadGroup()" << std::endl; @@ -495,10 +495,10 @@ void p3GroupDistrib::loadGroup(RsDistribGrp *newGrp) void p3GroupDistrib::loadGroupKey(RsDistribGrpKey *newKey) { /* load Key */ - std::string pid = newKey -> PeerId(); - std::string gid = newKey -> grpId; + const std::string &gid = newKey -> grpId; #ifdef DISTRIB_DEBUG + const std::string &pid = newKey -> PeerId(); std::cerr << "p3GroupDistrib::loadGroupKey()" << std::endl; std::cerr << "PeerId: " << pid << std::endl; std::cerr << "groupId: " << gid << std::endl; @@ -576,7 +576,7 @@ void p3GroupDistrib::loadGroupKey(RsDistribGrpKey *newKey) } -void p3GroupDistrib::loadMsg(RsDistribSignedMsg *newMsg, std::string src, bool local) +void p3GroupDistrib::loadMsg(RsDistribSignedMsg *newMsg, const std::string &src, bool local) { /****************** check the msg ******************/ /* Do the most likely checks to fail first.... @@ -1215,7 +1215,7 @@ RsDistribMsg *p3GroupDistrib::locked_getGroupMsg(std::string grpId, std::string return mit->second; } -bool p3GroupDistrib::subscribeToGroup(std::string grpId, bool subscribe) +bool p3GroupDistrib::subscribeToGroup(const std::string &grpId, bool subscribe) { RsStackMutex stack(distribMtx); /************* STACK MUTEX ************/ std::map::iterator git; @@ -1507,7 +1507,7 @@ bool p3GroupDistrib::loadList(std::list& load) if ((newGrp = dynamic_cast(*lit))) { - std::string gid = newGrp -> grpId; + const std::string &gid = newGrp -> grpId; loadGroup(newGrp); subscribeToGroup(gid, true); @@ -1547,7 +1547,7 @@ bool p3GroupDistrib::loadList(std::list& load) * As All the child packets are Packed, we should only need RsSerialDistrib() in it. */ -pqistore *p3GroupDistrib::createStore(BinInterface *bio, std::string src, uint32_t bioflags) +pqistore *p3GroupDistrib::createStore(BinInterface *bio, const std::string &src, uint32_t bioflags) { RsSerialiser *rsSerialiser = new RsSerialiser(); RsSerialType *serialType = new RsDistribSerialiser(); @@ -2706,7 +2706,7 @@ bool p3GroupDistrib::locked_checkGroupKeys(GroupInfo &info) bool p3GroupDistrib::locked_updateGroupAdminKey(GroupInfo &info, RsDistribGrpKey *newKey) { /* so firstly - check that the KeyId matches something in the group */ - std::string keyId = newKey->key.keyId; + const std::string &keyId = newKey->key.keyId; #ifdef DISTRIB_DEBUG std::cerr << "p3GroupDistrib::locked_updateGroupAdminKey() grpId: " << keyId; @@ -2795,7 +2795,7 @@ bool p3GroupDistrib::locked_updateGroupAdminKey(GroupInfo &info, RsDistribGrpKe bool p3GroupDistrib::locked_updateGroupPublishKey(GroupInfo &info, RsDistribGrpKey *newKey) { /* so firstly - check that the KeyId matches something in the group */ - std::string keyId = newKey->key.keyId; + const std::string &keyId = newKey->key.keyId; #ifdef DISTRIB_DEBUG std::cerr << "p3GroupDistrib::locked_updateGroupPublishKey() grpId: " << info.grpId << " keyId: " << keyId; diff --git a/libretroshare/src/services/p3distrib.h b/libretroshare/src/services/p3distrib.h index 441a79be3..5995bcdb1 100644 --- a/libretroshare/src/services/p3distrib.h +++ b/libretroshare/src/services/p3distrib.h @@ -272,8 +272,8 @@ class p3GroupDistrib: public CacheSource, public CacheStore, public p3Config, pu int loadAnyCache(const CacheData &data, bool local); /* load cache files */ - void loadFileGroups(std::string filename, std::string src, bool local); - void loadFileMsgs(std::string filename, uint16_t cacheSubId, std::string src, uint32_t ts, bool local); + void loadFileGroups(const std::string &filename, const std::string &src, bool local); + void loadFileMsgs(const std::string &filename, uint16_t cacheSubId, const std::string &src, uint32_t ts, bool local); bool backUpKeys(const std::list &keysToBackUp, std::string grpId); void locked_sharePubKey(); @@ -294,7 +294,7 @@ class p3GroupDistrib: public CacheSource, public CacheStore, public p3Config, pu * @param src src of msg (peer id) * @param local is this a local cache msg (your msg) */ - void loadMsg(RsDistribSignedMsg *msg, std::string src, bool local); + void loadMsg(RsDistribSignedMsg *msg, const std::string &src, bool local); /*! * adds newgrp to grp set, GroupInfo type created and stored @@ -344,7 +344,7 @@ class p3GroupDistrib: public CacheSource, public CacheStore, public p3Config, pu * @param subscribe true to subscribe and vice versa * @return */ - bool subscribeToGroup(std::string grpId, bool subscribe); + bool subscribeToGroup(const std::string &grpId, bool subscribe); @@ -562,7 +562,7 @@ class p3GroupDistrib: public CacheSource, public CacheStore, public p3Config, pu * @param bioflags read write permision for bio * @return pointer to pqistore instance */ - virtual pqistore *createStore(BinInterface *bio, std::string src, uint32_t bioflags); + virtual pqistore *createStore(BinInterface *bio, const std::string &src, uint32_t bioflags); /*! * checks to see if admin signature is valid diff --git a/libretroshare/src/services/p3forums.cc b/libretroshare/src/services/p3forums.cc index 935ab1e97..989ad9313 100644 --- a/libretroshare/src/services/p3forums.cc +++ b/libretroshare/src/services/p3forums.cc @@ -544,7 +544,7 @@ bool p3Forums::getMessageCount(const std::string fId, unsigned int &newCount, un void p3Forums::locked_notifyGroupChanged(GroupInfo &grp, uint32_t flags) { - std::string grpId = grp.grpId; + const std::string &grpId = grp.grpId; std::string msgId; std::string nullId; diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro index ce39dcfe5..24cb27be8 100644 --- a/retroshare-gui/src/RetroShare.pro +++ b/retroshare-gui/src/RetroShare.pro @@ -95,6 +95,8 @@ win32 { #LIBS += -L"D/Qt/2009.03/qt/plugins/imageformats" #QTPLUGIN += qjpeg + PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a + LIBS += ../../libretroshare/src/lib/libretroshare.a LIBS += -L"../../../../lib" LIBS += -lssl -lcrypto -lgpgme -lpthreadGC2d -lminiupnpc -lz @@ -139,10 +141,7 @@ macx { bitdht { LIBS += ../../libbitdht/src/lib/libbitdht.a - linux-* { - # maybe it is also useful for something else than Linux? - PRE_TARGETDEPS *= ../../libbitdht/src/lib/libbitdht.a - } + PRE_TARGETDEPS *= ../../libbitdht/src/lib/libbitdht.a } win32 {