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:
drbob 2008-02-03 06:17:33 +00:00
parent 789e3a1f62
commit 3451af6152
23 changed files with 288 additions and 279 deletions

View file

@ -1,52 +1,49 @@
RS_TOP_DIR = ..
include ../make.opt
##### Define any flags that are needed for this section #######
###############################################################
OBJ = findex.o fimonitor.o cachestrapper.o fistore.o \
###############################################################
include $(RS_TOP_DIR)/scripts/config.mk
###############################################################
RSOBJ = findex.o fimonitor.o cachestrapper.o fistore.o \
rsexpr.o
EXEC = fitest2 fisavetest ficachetest searchtest
TESTOBJ = fitest2.o fisavetest.o ficachetest.o searchtest.o
TESTS = fitest2 fisavetest ficachetest searchtest
ifeq ($(OS),Linux)
EXEC += fimontest
TESTOBJ += fimontest.o
TESTS += fimontest
endif
all : $(OBJ) librs $(EXEC)
librs: $(OBJ)
$(AR) r $(LIBRS) $(OBJ)
$(RANLIB) $(LIBRS)
ifeq ($(OS),MacOSX)
TESTOBJ += fimontest.o
TESTS += fimontest
endif
ftest: $(OBJ) ftest.o
$(CC) $(CFLAGS) -o ftest $(OBJ) ftest.o $(RSLIBS)
looktest: $(OBJ) looktest.o
$(CC) $(CFLAGS) -o looktest $(OBJ) looktest.o $(RSLIBS)
all: librs tests
fitest2 : fitest2.o $(OBJ)
$(CC) $(CFLAGS) -o fitest2 fitest2.o $(OBJ) $(RSLIBS)
$(CC) $(CFLAGS) -o fitest2 fitest2.o $(OBJ) $(LIBS)
fisavetest : fisavetest.o $(OBJ)
$(CC) $(CFLAGS) -o fisavetest fisavetest.o $(OBJ) $(RSLIBS)
$(CC) $(CFLAGS) -o fisavetest fisavetest.o $(OBJ) $(LIBS)
fimontest : fimontest.o $(OBJ)
$(CC) $(CFLAGS) -o fimontest fimontest.o $(OBJ) $(RSLIBS)
$(CC) $(CFLAGS) -o fimontest fimontest.o $(OBJ) $(LIBS)
ficachetest : ficachetest.o $(OBJ)
$(CC) $(CFLAGS) -o ficachetest ficachetest.o $(OBJ) $(RSLIBS)
$(CC) $(CFLAGS) -o ficachetest ficachetest.o $(OBJ) $(LIBS)
searchtest : searchtest.o $(OBJ)
$(CC) $(CFLAGS) -o searchtest searchtest.o $(OBJ) $(RSLIBS)
$(CC) $(CFLAGS) -o searchtest searchtest.o $(OBJ) $(LIBS)
.cc.o:
$(CC) $(CFLAGS) -c $<
clean:
-/bin/rm $(OBJ) ftest.o looktest.o
-/bin/rm fitest2.o fisavetest.o fimontest.o
-/bin/rm ficachetest.o searchtest.o
clobber: clean
-/bin/rm $(EXEC)
###############################################################
include $(RS_TOP_DIR)/scripts/rules.mk
###############################################################