Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-15 16:49:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Windows compile with Qt 5 (Merged from branch v0.5.5)

Browse source 
- Revert change of revision 7063 in openpgpsdk.pro for Windows compile
- Changed order of the libraries in FeedReader plugin

Fixed Windows compile with MinGW 4.8.0
- Added missing include

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7111 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-02-12 22:03:20 +00:00
parent df34a6818c
commit f818bb8e9a
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/FeedReader/FeedReader.pro
View file

@ -1,8 +1,3 @@
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
@ -101,8 +96,8 @@ win32 {
INCLUDEPATH += $${CURL_DIR}/include $${LIBXML2_DIR}/include $${LIBXSLT_DIR} $${LIBICONV_DIR}/include
LIBS += -lcurl -lxml2 -lxslt -lws2_32 -lwldap32
LIBS += -lssl -lcrypto -lgdi32 -lwsock32
# Change order of the libraries
LIBS = -lcurl -lxml2 -lz -lxslt -lws2_32 -lwldap32 -lssl -lcrypto -lgdi32 -lwsock32 $${LIBS}
}
openbsd-* {