Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

Fixes reliable building in both mingw32 shell as Qt creator.

Browse Source 
Cleans redundant path naming.
This commit is contained in:
Roy Jacobs
2017-03-04 12:17:51 +01:00
parent 2a8419c7cd
commit 630a852669
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
monero-wallet-gui.pro
View File

@@ -144,25 +144,29 @@ CONFIG(WITH_SCANNER) {
win32 { win32 {
# QMAKE_HOST.arch is unreliable, will allways report 32bit if mingw32 shell is run.
# Obtaining arch through uname should be reliable. This also fixes building the project in Qt creator without changes.
MSYS_HOST_ARCH = $$system(uname -a | grep -o "x86_64")
# Even if host is 64bit, we are building win32 spec, so mingw path should allways be "/mingw32"
MSYS_MINGW_PATH=/mingw32
BOOST_MINGW_PATH=$$MSYS_MINGW_PATH/boost
# Win64 Host settings # Win64 Host settings
contains(QMAKE_HOST.arch, x86_64) { contains(MSYS_HOST_ARCH, x86_64) {
message("Host is 64bit") message("Host is 64bit")
MSYS_PATH=c:/msys64/mingw64 MSYS_PATH=c:/msys64/mingw32
MSYS_MINGW_PATH=/mingw64
# boost root path # boost root path
BOOST_PATH=c:/msys64/mingw64/boost BOOST_PATH=$$MSYS_PATH/boost
BOOST_MINGW_PATH=/mingw64/boost
# WIN32 Host settings # WIN32 Host settings
} else { } else {
message("Host is 32bit") message("Host is 32bit")
MSYS_PATH=c:/msys32/mingw32 MSYS_PATH=c:/msys32/mingw32
MSYS_MING_PATH=/mingw32
# boost root path # boost root path
BOOST_PATH=c:/msys32/mingw32/boost BOOST_PATH=$$MSYS_PATH/boost
BOOST_MINGW_PATH=/mingw32/boost
} }