mirror of
https://github.com/monero-project/monero-gui.git
synced 2025-01-10 21:04:32 +00:00
win64 boost settings
This commit is contained in:
parent
8cdad2fc66
commit
417e49b2c8
2 changed files with 25 additions and 15 deletions
|
@ -55,7 +55,8 @@ elif [ "$platform" == "linux" ]; then
|
||||||
elif [ "$platform" == "mingw64" ]; then
|
elif [ "$platform" == "mingw64" ]; then
|
||||||
# Do something under Windows NT platform
|
# Do something under Windows NT platform
|
||||||
echo "Configuring build for MINGW64.."
|
echo "Configuring build for MINGW64.."
|
||||||
cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D STATIC=ON -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" -G "MSYS Makefiles" ../..
|
BOOST_ROOT=/msys2/mingw64/boost
|
||||||
|
cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D STATIC=ON BOOST_ROOT="$BOOST_ROOT" -D ARCH="x86-64" -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" -G "MSYS Makefiles" ../..
|
||||||
elif [ "$platform" == "mingw32" ]; then
|
elif [ "$platform" == "mingw32" ]; then
|
||||||
# Do something under Windows NT platform
|
# Do something under Windows NT platform
|
||||||
echo "Configuring build for MINGW32.."
|
echo "Configuring build for MINGW32.."
|
||||||
|
|
|
@ -71,30 +71,27 @@ LIBS += -L$$WALLET_ROOT/lib \
|
||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
|
|
||||||
|
# Win64 Host settings
|
||||||
contains(QMAKE_HOST.arch, x86_64) {
|
contains(QMAKE_HOST.arch, x86_64) {
|
||||||
message("Host is 64bit")
|
message("Host is 64bit")
|
||||||
MSYS_PATH=c:/msys64/mingw32
|
MSYS_PATH=c:/msys64/mingw32
|
||||||
|
|
||||||
|
# boost root path
|
||||||
|
BOOST_PATH=/msys2/mingw64/boost
|
||||||
|
|
||||||
|
# WIN32 Host settings
|
||||||
} else {
|
} else {
|
||||||
message("Host is 32bit")
|
message("Host is 32bit")
|
||||||
MSYS_PATH=c:/msys32/mingw32
|
MSYS_PATH=c:/msys32/mingw32
|
||||||
}
|
|
||||||
|
|
||||||
# boost root path
|
# boost root path
|
||||||
BOOST_PATH=/c/Qt/Qt5.7.0/Tools/mingw530_32/boost
|
BOOST_PATH=/c/Qt/Qt5.7.0/Tools/mingw530_32/boost
|
||||||
|
|
||||||
!contains(QMAKE_TARGET.arch, x86_64) {
|
|
||||||
message("Target is 32bit")
|
|
||||||
## Windows x86 (32bit) specific build here
|
|
||||||
## there's 2Mb stack in libwallet allocated internally, so we set stack=4Mb
|
|
||||||
## this fixes app crash for x86 Windows build
|
|
||||||
QMAKE_LFLAGS += -Wl,--stack,4194304
|
|
||||||
} else {
|
|
||||||
message("Target is 64bit")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
LIBS+=-L$$MSYS_PATH/lib
|
LIBS+=-L$$MSYS_PATH/lib
|
||||||
LIBS+=-L$$BOOST_PATH/lib
|
LIBS+=-L$$BOOST_PATH/lib
|
||||||
|
|
||||||
LIBS+= \
|
LIBS+= \
|
||||||
-Wl,-Bstatic \
|
-Wl,-Bstatic \
|
||||||
-lboost_serialization-mt-s \
|
-lboost_serialization-mt-s \
|
||||||
|
@ -112,8 +109,16 @@ win32 {
|
||||||
-lwsock32 \
|
-lwsock32 \
|
||||||
-lIphlpapi \
|
-lIphlpapi \
|
||||||
-lgdi32
|
-lgdi32
|
||||||
|
|
||||||
|
!contains(QMAKE_TARGET.arch, x86_64) {
|
||||||
|
message("Target is 32bit")
|
||||||
|
## Windows x86 (32bit) specific build here
|
||||||
|
## there's 2Mb stack in libwallet allocated internally, so we set stack=4Mb
|
||||||
|
## this fixes app crash for x86 Windows build
|
||||||
|
QMAKE_LFLAGS += -Wl,--stack,4194304
|
||||||
|
} else {
|
||||||
|
message("Target is 64bit")
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -241,6 +246,10 @@ macx {
|
||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
deploy.commands += windeployqt $$sprintf("%1/%2/%3.exe", $$OUT_PWD, $$DESTDIR, $$TARGET) -release -qmldir=$$PWD
|
deploy.commands += windeployqt $$sprintf("%1/%2/%3.exe", $$OUT_PWD, $$DESTDIR, $$TARGET) -release -qmldir=$$PWD
|
||||||
|
# Win64 msys2 deploy settings
|
||||||
|
contains(QMAKE_HOST.arch, x86_64) {
|
||||||
|
deploy.commands += $$escape_expand(\n\t) $$PWD/windeploy_helper.sh $$DESTDIR
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue