Merge pull request #86 from PhenomRetroShare/Fix_Win7_32bCompilationFromScratch

Fix Windows 7 32b Compilation from scratch.
This commit is contained in:
defnax 2015-11-06 01:58:30 +01:00
commit c41f98cb4c
22 changed files with 1257 additions and 208 deletions

View file

@ -89,7 +89,18 @@ linux-* {
win32 {
DEFINES += CURL_STATICLIB LIBXML_STATIC LIBXSLT_STATIC LIBEXSLT_STATIC
LIBS += -lcurl -lxml2 -lz -lxslt -lws2_32 -lwldap32 -lssl -lcrypto
#Have to reorder libs, else got /libs/lib/libcrypto.a(bio_lib.o):bio_lib.c:(.text+0x0): multiple definition of `BIO_new'
LIBS = -lcurl -lxml2 -lz -lxslt -lws2_32 -lwldap32 -lssl -lcrypto -lgdi32 $${LIBS}
exists(C:/msys32/mingw32/include) {
message(msys2 xml2 is installed.)
INC_DIR += "C:/msys32/mingw32/include/libxml2"
}
exists(C:/msys64/mingw32/include) {
message(msys2 xml2 is installed.)
INC_DIR += "C:/msys64/mingw32/include/libxml2"
}
DEPENDPATH += . $$INC_DIR
INCLUDEPATH += . $$INC_DIR
}
openbsd-* {