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
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

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")
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-* {