* Switched on Dht "Attach" Mode if RS is firewalled. (and not nice firewall).

* Added interfaces to enable AttachMode switch.
 * Added further tcponudp tests.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4484 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2011-07-21 11:28:19 +00:00
parent f6002b3981
commit b56ddfeb5b
10 changed files with 445 additions and 11 deletions

View file

@ -40,6 +40,7 @@ RANLIB = ranlib
# Dummy ranlib -> can't do it until afterwards with universal binaries.
# RANLIB = ls -l
BITDIR = $(DHT_TOP_DIR)/lib
LIBDIR = $(RS_TOP_DIR)/lib
LIBRS = $(LIBDIR)/libretroshare.a
@ -82,16 +83,14 @@ LIBS = -Wl,-search_paths_first
# LIBS += -arch ppc -arch i386
#LIBS += -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5u.sdk
LIBS += -L$(LIBDIR) -lretroshare
LIBS = -lgpgme -L$(LIBDIR) -lretroshare
LIBS += -L$(BITDIR) -lbitdht
ifdef PQI_USE_XPGP
LIBS += -L$(SSL_DIR)
LIBS += -L$(SSL_DIR)
endif
LIBS += -lssl -lcrypto -lpthread
LIBS += -L$(OPT_LIBS)
LIBS += -lgpgme -lgpg-error
LIBS += -L$(UPNPC_DIR) -lminiupnpc
LIBS += $(XLIB) -ldl -lz
RSLIBS = $(LIBS)
LIBS += $(XLIB) -ldl -lz