Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-25 09:11:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Windows compile with Qt 5

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


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.5@7109 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-02-12 15:52:43 +00:00
parent 8478ad870a
commit b105390563
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openpgpsdk/src/openpgpsdk.pro
View File

@ -1,5 +1,9 @@
TEMPLATE = lib TEMPLATE = lib
CONFIG = staticlib debug win32 {
CONFIG += staticlib
} else {
CONFIG = staticlib debug
}
DEFINES *= OPENSSL_NO_IDEA DEFINES *= OPENSSL_NO_IDEA

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") !include("../Common/retroshare_plugin.pri"): error("Could not include file ../Common/retroshare_plugin.pri")
CONFIG += qt uic qrc resources CONFIG += qt uic qrc resources
@ -101,8 +96,8 @@ win32 {
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 # Change order of the libraries
LIBS += -lssl -lcrypto -lgdi32 -lwsock32 LIBS = -lcurl -lxml2 -lz -lxslt -lws2_32 -lwldap32 -lssl -lcrypto -lgdi32 -lwsock32 $${LIBS}
} }
openbsd-* { openbsd-* {