mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-06 16:15:23 -04:00
Changes to libretroshare to make the system compile on Mac OSX 10.3
* minor changes to networking headers. * addition of several virtual destructors (remove warnings) * switched Makefiles to new system. * added macosx specific configuration file. * removed KadC compilation checks. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@324 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
789e3a1f62
commit
3451af6152
23 changed files with 288 additions and 279 deletions
|
@ -1,28 +1,24 @@
|
|||
|
||||
RS_TOP_DIR = ..
|
||||
include ../make.opt
|
||||
##### Define any flags that are needed for this section #######
|
||||
###############################################################
|
||||
|
||||
OBJ = ft.o ftfiler.o hashsearch.o \
|
||||
filedexserver.o
|
||||
###############################################################
|
||||
include $(RS_TOP_DIR)/scripts/config.mk
|
||||
###############################################################
|
||||
|
||||
EXEC = ftcachetest
|
||||
RSOBJ = ft.o ftfiler.o hashsearch.o filedexserver.o
|
||||
|
||||
all : $(OBJ) librs $(EXEC)
|
||||
TESTOBJ = ftcachetest.o
|
||||
|
||||
librs: $(OBJ)
|
||||
$(AR) r $(LIBRS) $(OBJ)
|
||||
$(RANLIB) $(LIBRS)
|
||||
TESTS = ftcachetest
|
||||
|
||||
all: librs tests
|
||||
|
||||
ftcachetest : ftcachetest.o $(OBJ)
|
||||
$(CC) $(CFLAGS) -o ftcachetest ftcachetest.o $(OBJ) $(RSLIBS)
|
||||
$(CC) $(CFLAGS) -o ftcachetest ftcachetest.o $(OBJ) $(LIBS)
|
||||
|
||||
.cc.o:
|
||||
$(CC) $(CFLAGS) -c $<
|
||||
|
||||
clean:
|
||||
-/bin/rm $(OBJ)
|
||||
-/bin/rm ftcachetest.o
|
||||
|
||||
clobber: clean
|
||||
-/bin/rm $(EXEC)
|
||||
###############################################################
|
||||
include $(RS_TOP_DIR)/scripts/rules.mk
|
||||
###############################################################
|
||||
|
||||
|
|
|
@ -58,15 +58,8 @@ class FileIndexMonitor;
|
|||
class ftFileRequest;
|
||||
class ftFileData;
|
||||
|
||||
|
||||
#ifdef PQI_USE_CHANNELS
|
||||
#include "pqi/pqichannel.h"
|
||||
#include "pqi/p3channel.h"
|
||||
#endif
|
||||
|
||||
#define MAX_RESULTS 100 // nice balance between results and traffic.
|
||||
|
||||
|
||||
class filedexserver: public p3Config
|
||||
{
|
||||
public:
|
||||
|
|
|
@ -31,22 +31,7 @@
|
|||
|
||||
#include "pqi/pqidebug.h"
|
||||
|
||||
/**** SHOULDN@T HAVE THIS DEPENDANCY ****/
|
||||
/**************** PQI_USE_XPGP ******************/
|
||||
#if defined(PQI_USE_XPGP)
|
||||
|
||||
#include "pqi/xpgpcert.h"
|
||||
|
||||
#else /* X509 Certificates */
|
||||
/**************** PQI_USE_XPGP ******************/
|
||||
|
||||
#include "pqi/sslcert.h"
|
||||
|
||||
#endif /* X509 Certificates */
|
||||
/**************** PQI_USE_XPGP ******************/
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
#include <sstream>
|
||||
|
||||
const int ftfilerzone = 86539;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue