Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-12 09:19:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #477 from PhenomRetroShare/Fix_MSys2Compilation

Browse source 
Fix Msys2 build when MINGW_PREFIX is not defined.
This commit is contained in:
Thunder 2016-08-28 14:35:09 +02:00 • committed by GitHub
commit 85a525a299
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
retroshare.pri
View file

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