From 04162f90d287468243c6697248111b54c9cdfeed Mon Sep 17 00:00:00 2001 From: Phenom Date: Wed, 17 Aug 2016 23:58:22 +0200 Subject: [PATCH] Fix Msys2 build when MINGW_PREFIX is not defined. Please look at AppVeyor success before merging. --- retroshare.pri | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/retroshare.pri b/retroshare.pri index 95c784512..fe7d77df2 100644 --- a/retroshare.pri +++ b/retroshare.pri @@ -47,19 +47,19 @@ win32 { } # Check for msys2 - isEmpty(MINGW_PREFIX) { + PREFIX_MSYS2 = $$(MINGW_PREFIX) + isEmpty(PREFIX_MSYS2) { 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" + PREFIX_MSYS2 = "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 = "C:\msys64\mingw32" } } - PREFIX_MSYS2 = $$(MINGW_PREFIX) !isEmpty(PREFIX_MSYS2) { message(msys2 is installed.) BIN_DIR += "$${PREFIX_MSYS2}/bin"