mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-29 11:01:22 -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
|
@ -28,7 +28,8 @@ LIBDIR = $(RS_TOP_DIR)/lib
|
|||
LIBRS = $(LIBDIR)/libretroshare.a
|
||||
|
||||
# Unix: Linux/Cygwin
|
||||
INCLUDE = -I $(RS_TOP_DIR) -I$(KADC_DIR)
|
||||
INCLUDE = -I $(RS_TOP_DIR)
|
||||
#-I$(KADC_DIR)
|
||||
CFLAGS = -Wall -g $(INCLUDE)
|
||||
|
||||
ifdef PQI_USE_XPGP
|
||||
|
@ -53,6 +54,15 @@ endif
|
|||
|
||||
|
||||
RSCFLAGS = -Wall -g $(INCLUDE)
|
||||
#########################################################################
|
||||
# OS Compile Options
|
||||
#########################################################################
|
||||
|
||||
# For the SSL BIO compilation. (Copied from OpenSSL compilation flags)
|
||||
BIOCC = gcc
|
||||
|
||||
# Linux flags
|
||||
BIOCFLAGS = -I $(SSL_DIR)/include -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DOPENSSL_NO_KRB5 -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
|
||||
|
||||
#########################################################################
|
||||
# OS specific Linking.
|
||||
|
@ -63,7 +73,7 @@ ifdef PQI_USE_XPGP
|
|||
LIBS += -L$(SSL_DIR)
|
||||
endif
|
||||
LIBS += -lssl -lcrypto -lpthread
|
||||
LIBS += -L$(KADC_DIR) -lKadC
|
||||
#LIBS += -L$(KADC_DIR) -lKadC
|
||||
LIBS += -L$(UPNPC_DIR) -lminiupnpc
|
||||
LIBS += $(XLIB) -ldl -lz
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue