Changes for Windows compile:

- removed some unnecessary libraries from retroshare_plugin.pri
- FeedReader
  - updated external libraries to libxml2-2.9.1 and curl-7.34.0
  - enabled ssl in libcurl
  - removed debug output

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6976 b45a01b8-16f6-495d-af2f-9b41ad6348cc

plugins/Common/retroshare_plugin.pri

@@ -54,8 +54,5 @@ win32 {
 	LIBS += -L"../../retroshare-gui/src/lib" -lretroshare-gui
 
 	LIBS += -L"$$PWD/../../../lib"
-	LIBS += -lssl -lcrypto -lpthread -lminiupnpc -lz
-# added after bitdht
-	LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32
-	LIBS += -lole32 -lwinmm
+	LIBS += -lpthread
 }

plugins/FeedReader/FeedReader.pro

@@ -1,3 +1,8 @@
+win32 {
+	# Fix double defined symbols BIO_* (Find a better solution)
+	LIBS += -lcrypto
+}
+
 !include("../Common/retroshare_plugin.pri"): error("Could not include file ../Common/retroshare_plugin.pri")
 
 CONFIG += qt uic qrc resources
@@ -90,13 +95,14 @@ linux-* {
 win32 {
 	DEFINES += CURL_STATICLIB LIBXML_STATIC LIBXSLT_STATIC LIBEXSLT_STATIC
 
-	CURL_DIR = ../../../curl-7.26.0
-	LIBXML2_DIR = ../../../libxml2-2.8.0
+	CURL_DIR = ../../../curl-7.34.0
+	LIBXML2_DIR = ../../../libxml2-2.9.1
 	LIBXSLT_DIR = ../../../libxslt-1.1.28
 
 	INCLUDEPATH += $${CURL_DIR}/include $${LIBXML2_DIR}/include $${LIBXSLT_DIR} $${LIBICONV_DIR}/include
 
 	LIBS += -lcurl -lxml2 -lxslt -lws2_32 -lwldap32
+	LIBS += -lssl -lcrypto -lgdi32 -lwsock32
 }
 
 openbsd-* {

plugins/FeedReader/services/p3FeedReaderThread.cc

@@ -35,7 +35,6 @@ enum FeedFormat { FORMAT_RSS, FORMAT_RDF, FORMAT_ATOM };
 /*********
  * #define FEEDREADER_DEBUG
  *********/
-#define FEEDREADER_DEBUG
 
 p3FeedReaderThread::p3FeedReaderThread(p3FeedReader *feedReader, Type type, const std::string &feedId) :
 	RsThread(), mFeedReader(feedReader), mType(type), mFeedId(feedId)

plugins/FeedReader/util/CURLWrapper.cpp

@@ -79,6 +79,7 @@ CURLcode CURLWrapper::downloadText(const std::string &link, std::string &data)
 	curl_easy_setopt(mCurl, CURLOPT_URL, link.c_str());
 	curl_easy_setopt(mCurl, CURLOPT_WRITEFUNCTION, writeFunctionString);
 	curl_easy_setopt(mCurl, CURLOPT_WRITEDATA, &data);
+	curl_easy_setopt(mCurl, CURLOPT_SSL_VERIFYPEER, false);
 
 	return curl_easy_perform(mCurl);
 }