diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-03-10 14:30:24 +0000 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-03-10 14:30:24 +0000 |
| commit | 1b021c599b9292ddffa02ca37d1e28e2cd17c9b4 (patch) | |
| tree | 9c4c0f7b19617686940fe514a3534f255562a059 | |
| parent | b611871940376d30f6a292e9d0acb8c495f8f64e (diff) | |
| parent | 27bc424f04200646315627c9dacdf1a943d802d2 (diff) | |
| download | monzero-gui-1b021c599b9292ddffa02ca37d1e28e2cd17c9b4.tar.gz monzero-gui-1b021c599b9292ddffa02ca37d1e28e2cd17c9b4.tar.xz monzero-gui-1b021c599b9292ddffa02ca37d1e28e2cd17c9b4.zip | |
Merge pull request #545
27bc424 Fixed mingw path (Roy Jacobs)
f544ece Improved windows host/target detection and fixed buildbot building (Roy Jacobs)
| -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..0dca61bc 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=/mingw64 + # WIN32 Target settings + } else { + MSYS_MINGW_PATH=/mingw32 } + + 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 |