Merge pull request #474 from PhenomRetroShare/Fix_MSys2WindowsCompilation

Fix MSys2 Windows Compilation after #f1847a9 commit.
This commit is contained in:
Thunder 2016-08-15 19:54:52 +02:00 committed by GitHub
commit b8158a47dc

View File

@ -47,7 +47,19 @@ win32 {
} }
# Check for msys2 # Check for msys2
PREFIX_MSYS2 = $$(MINGW_PREFIX) isEmpty(MINGW_PREFIX) {
exists(C:/msys32/mingw32/include) {
message(MINGW_PREFIX is empty. Set it in your environment variables.)
message(Found it here:C:\msys32\mingw32)
MINGW_PREFIX = "C:\msys32\mingw32"
}
exists(C:/msys64/mingw32/include) {
message(MINGW_PREFIX is empty. Set it in your environment variables.)
message(Found it here:C:\msys64\mingw32)
MINGW_PREFIX = "C:\msys64\mingw32"
}
}
PREFIX_MSYS2 = $${MINGW_PREFIX}
!isEmpty(PREFIX_MSYS2) { !isEmpty(PREFIX_MSYS2) {
message(msys2 is installed.) message(msys2 is installed.)
BIN_DIR += "$${PREFIX_MSYS2}/bin" BIN_DIR += "$${PREFIX_MSYS2}/bin"