Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 15:39:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changes for Windows compile:

Browse Source 
- 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
This commit is contained in:
thunder2 2013-12-28 23:49:50 +00:00
parent be3a593ee2
commit dddc4356f1
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/Common/retroshare_plugin.pri
View File

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

10
plugins/FeedReader/FeedReader.pro
View File

@ -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") !include("../Common/retroshare_plugin.pri"): error("Could not include file ../Common/retroshare_plugin.pri")
CONFIG += qt uic qrc resources CONFIG += qt uic qrc resources
@ -90,13 +95,14 @@ linux-* {
win32 { win32 {
DEFINES += CURL_STATICLIB LIBXML_STATIC LIBXSLT_STATIC LIBEXSLT_STATIC DEFINES += CURL_STATICLIB LIBXML_STATIC LIBXSLT_STATIC LIBEXSLT_STATIC
CURL_DIR = ../../../curl-7.26.0 CURL_DIR = ../../../curl-7.34.0
LIBXML2_DIR = ../../../libxml2-2.8.0 LIBXML2_DIR = ../../../libxml2-2.9.1
LIBXSLT_DIR = ../../../libxslt-1.1.28 LIBXSLT_DIR = ../../../libxslt-1.1.28
INCLUDEPATH += $${CURL_DIR}/include $${LIBXML2_DIR}/include $${LIBXSLT_DIR} $${LIBICONV_DIR}/include INCLUDEPATH += $${CURL_DIR}/include $${LIBXML2_DIR}/include $${LIBXSLT_DIR} $${LIBICONV_DIR}/include
LIBS += -lcurl -lxml2 -lxslt -lws2_32 -lwldap32 LIBS += -lcurl -lxml2 -lxslt -lws2_32 -lwldap32
LIBS += -lssl -lcrypto -lgdi32 -lwsock32
} }
openbsd-* { openbsd-* {

1
plugins/FeedReader/services/p3FeedReaderThread.cc
View File

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

1
plugins/FeedReader/util/CURLWrapper.cpp
View File

@ -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_URL, link.c_str());
curl_easy_setopt(mCurl, CURLOPT_WRITEFUNCTION, writeFunctionString); curl_easy_setopt(mCurl, CURLOPT_WRITEFUNCTION, writeFunctionString);
curl_easy_setopt(mCurl, CURLOPT_WRITEDATA, &data); curl_easy_setopt(mCurl, CURLOPT_WRITEDATA, &data);
curl_easy_setopt(mCurl, CURLOPT_SSL_VERIFYPEER, false);
return curl_easy_perform(mCurl); return curl_easy_perform(mCurl);
} }