diff options
| author | Roy Jacobs <roy.jacobs@12roar.com> | 2017-03-08 14:05:02 +0100 |
|---|---|---|
| committer | Roy Jacobs <roy.jacobs@12roar.com> | 2017-03-08 14:05:02 +0100 |
| commit | f544eceaa51ea14c6f46c8afc2faf8b46c46fe63 (patch) | |
| tree | c5c459bc2551774f99e253a033fafb689aa5dfe4 | |
| parent | 632d347d071adac0aee02837f1616d2abf745eee (diff) | |
| download | monzero-gui-f544eceaa51ea14c6f46c8afc2faf8b46c46fe63.tar.gz monzero-gui-f544eceaa51ea14c6f46c8afc2faf8b46c46fe63.tar.xz monzero-gui-f544eceaa51ea14c6f46c8afc2faf8b46c46fe63.zip | |
Improved windows host/target detection and fixed buildbot building
| -rw-r--r-- | monero-wallet-gui.pro | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro index 8c22d052..109570d1 100644 --- a/monero-wallet-gui.pro +++ b/monero-wallet-gui.pro @@ -148,27 +148,31 @@ win32 { # 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(MSYS_HOST_ARCH, x86_64) { message("Host is 64bit") - MSYS_PATH=c:/msys64/mingw32 - - # boost root path - BOOST_PATH=$$MSYS_PATH/boost + MSYS_ROOT_PATH=c:/msys64 # WIN32 Host settings } else { message("Host is 32bit") - MSYS_PATH=c:/msys32/mingw32 + MSYS_ROOT_PATH=c:/msys32 + } - # boost root path - BOOST_PATH=$$MSYS_PATH/boost + # WIN64 Target settings + contains(QMAKE_HOST.arch, x86_64) { + MSYS_MINGW_PATH=/mingw32 + # WIN32 Target settings + } else { + MSYS_MINGW_PATH=/mingw64 } + + MSYS_PATH=$$MSYS_ROOT_PATH$$MSYS_MINGW_PATH + + # boost root path + BOOST_PATH=$$MSYS_PATH/boost + BOOST_MINGW_PATH=$$MSYS_MINGW_PATH/boost LIBS+=-L$$MSYS_PATH/lib LIBS+=-L$$MSYS_MINGW_PATH/lib |