mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-07 00:25:16 -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,18 +1,21 @@
|
|||
|
||||
RS_TOP_DIR = ..
|
||||
include ../make.opt
|
||||
##### Define any flags that are needed for this section #######
|
||||
###############################################################
|
||||
|
||||
OBJ = b64.o opendhtstr.o opendht.o opendhtmgr.o
|
||||
###############################################################
|
||||
include $(RS_TOP_DIR)/scripts/config.mk
|
||||
###############################################################
|
||||
|
||||
#CADKINC = /home/rmf24/prog/src/KadC
|
||||
#CFLAGS += -I $(CADKINC)
|
||||
#RSLIBS += -L $(CADKINC) -lKadC
|
||||
RSOBJ = b64.o opendhtstr.o opendht.o opendhtmgr.o
|
||||
|
||||
TESTOBJ = odhtstr_test.o odhtpost_test.o odhtmgr_test.o
|
||||
|
||||
all : $(OBJ) librs odhtstr_test odhtpost_test odhtmgr_test
|
||||
TESTS = odhtstr_test odhtpost_test odhtmgr_test
|
||||
|
||||
#dhttest
|
||||
all: librs tests
|
||||
|
||||
#dhttest is OLD
|
||||
dhttest: $(OBJ) dhttest.o
|
||||
$(CC) $(CFLAGS) -o dhttest $(OBJ) dhttest.o $(RSLIBS)
|
||||
|
||||
|
@ -25,19 +28,11 @@ odhtstr_test: $(OBJ) odhtstr_test.o
|
|||
odhtmgr_test: $(OBJ) odhtmgr_test.o
|
||||
$(CC) $(CFLAGS) -o odhtmgr_test $(OBJ) odhtmgr_test.o $(RSLIBS)
|
||||
|
||||
librs: $(OBJ)
|
||||
$(AR) r $(LIBRS) $(OBJ)
|
||||
$(RANLIB) $(LIBRS)
|
||||
|
||||
.cc.o:
|
||||
$(CC) $(CFLAGS) -c $<
|
||||
|
||||
# Extra Rule...
|
||||
.c.o:
|
||||
$(CC) $(CFLAGS) -c $<
|
||||
|
||||
clean:
|
||||
-/bin/rm $(OBJ) dhttest.o
|
||||
|
||||
clobber: clean
|
||||
-/bin/rm dhttest
|
||||
###############################################################
|
||||
include $(RS_TOP_DIR)/scripts/rules.mk
|
||||
###############################################################
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue