From 3200ea57b2fa765cb982d36353e69f47c9b7109a Mon Sep 17 00:00:00 2001 From: Phenom Date: Mon, 15 Aug 2016 16:16:46 +0200 Subject: [PATCH] Fix MSys2 Windows Compilation after #f1847a9 commit. As used by AppVeyor. --- retroshare.pri | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/retroshare.pri b/retroshare.pri index 9a864a5ea..b09e3ebe8 100644 --- a/retroshare.pri +++ b/retroshare.pri @@ -47,7 +47,19 @@ win32 { } # 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) { message(msys2 is installed.) BIN_DIR += "$${PREFIX_MSYS2}/bin"