From d2b3458f2b25b9213a2b29c634cb1673dfac4dab Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 5 Sep 2009 17:23:58 +0000 Subject: [PATCH] added for MSYS compile releated changes by default its disabled git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1598 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/scripts/config-mingw.mk | 25 ++++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/libretroshare/src/scripts/config-mingw.mk b/libretroshare/src/scripts/config-mingw.mk index c5c683092..c0040ac4e 100644 --- a/libretroshare/src/scripts/config-mingw.mk +++ b/libretroshare/src/scripts/config-mingw.mk @@ -28,25 +28,22 @@ ZLIB_DIR=$(SRC_ROOT_PKG)/zlib-1.2.3 SSL_DIR=$(SRC_ROOT_PKG)/openssl-tmp UPNPC_DIR=$(SRC_ROOT_PKG)/miniupnpc-1.3 +########################################################################### -#SSL_DIR=$(SRC_ROOT_PKG)/openssl-0.9.8k +#### Enable this section for compiling with MSYS/MINGW compile +#SRC_ROOT=/home/linux -################### +#SSL_DIR=$(SRC_ROOT)/OpenSSL +#GPGME_DIR=$(SRC_ROOT)/gpgme-1.1.8 +#GPG_ERROR_DIR=$(SRC_ROOT)/libgpg-error-1.7 -#ALT_SRC_ROOT=/cygdrive/c/RetroShareBuild/src -#SRC_ROOT=/cygdrive/c/RetroShareBuild/src - -#PTHREADS_DIR=$(ALT_SRC_ROOT)/pthreads-w32-2-8-0-release - -################### - -#ZLIB_DIR=$(ALT_SRC_ROOT)/zlib-1.2.3 -#SSL_DIR=$(SRC_ROOT)/openssl-0.9.7g-xpgp-0.1c +#ZLIB_DIR=$(SRC_ROOT)/zlib-1.2.3 #UPNPC_DIR=$(SRC_ROOT)/miniupnpc-1.0 +#PTHREADS_DIR=$(SRC_ROOT)/pthreads-w32-2-8-0-release include $(RS_TOP_DIR)/scripts/checks.mk -############ ENFORCE DIRECTORY NAMING ######################## +############ ENFORCE DIRECTORY NAMING ####################################### CC = g++ RM = /bin/rm @@ -117,6 +114,10 @@ CFLAGS += -I$(PTHREADS_DIR)/include CFLAGS += -I$(ZLIB_DIR) CFLAGS += -I$(SRC_ROOT_GPG)/include +### Enable this for GPGME and GPG ERROR dirs +#CFLAGS += -I$(GPGME_DIR)/src +#CFLAGS += -I$(GPG_ERROR_DIR)/src + CFLAGS += $(WININC)