Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-12 07:59:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed check for MSYS2 environment for Windows compile

Browse Source
This commit is contained in:
thunder2 2016-08-14 14:11:01 +02:00
parent b0b4320c0b
commit f1847a954f
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/FeedReader/FeedReader.pro
View File

@ -91,14 +91,13 @@ win32 {
#Have to reorder libs, else got /libs/lib/libcrypto.a(bio_lib.o):bio_lib.c:(.text+0x0): multiple definition of `BIO_new' #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} LIBS = -lcurl -lxml2 -lz -lxslt -lws2_32 -lwldap32 -lssl -lcrypto -lgdi32 $${LIBS}
exists(C:/msys32/mingw32/include) {
message(msys2 xml2 is installed.) # Check for msys2
INC_DIR += "C:/msys32/mingw32/include/libxml2" !isEmpty(PREFIX_MSYS2) {
} message(Use msys2 xml2.)
exists(C:/msys64/mingw32/include) { INC_DIR += "$${PREFIX_MSYS2}/include/libxml2"
message(msys2 xml2 is installed.)
INC_DIR += "C:/msys64/mingw32/include/libxml2"
} }
DEPENDPATH += . $$INC_DIR DEPENDPATH += . $$INC_DIR
INCLUDEPATH += . $$INC_DIR INCLUDEPATH += . $$INC_DIR
} }

15
retroshare.pri
View File

@ -45,16 +45,11 @@ win32 {
isEmpty(INC_DIR) { INC_DIR = "$${PREFIX}/include" } isEmpty(INC_DIR) { INC_DIR = "$${PREFIX}/include" }
isEmpty(LIB_DIR) { LIB_DIR = "$${PREFIX}/lib" } isEmpty(LIB_DIR) { LIB_DIR = "$${PREFIX}/lib" }
} }
exists(C:/msys32/mingw32/include) {
message(msys2 32b is installed.) # Check for msys2
PREFIX_MSYS2 = "C:/msys32/mingw32" PREFIX_MSYS2 = $$(MINGW_PREFIX)
BIN_DIR += "$${PREFIX_MSYS2}/bin" !isEmpty(PREFIX_MSYS2) {
INC_DIR += "$${PREFIX_MSYS2}/include" message(msys2 is installed.)
LIB_DIR += "$${PREFIX_MSYS2}/lib"
}
exists(C:/msys64/mingw32/include) {
message(msys2 64b is installed.)
PREFIX_MSYS2 = "C:/msys64/mingw32"
BIN_DIR += "$${PREFIX_MSYS2}/bin" BIN_DIR += "$${PREFIX_MSYS2}/bin"
INC_DIR += "$${PREFIX_MSYS2}/include" INC_DIR += "$${PREFIX_MSYS2}/include"
LIB_DIR += "$${PREFIX_MSYS2}/lib" LIB_DIR += "$${PREFIX_MSYS2}/lib"