diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-12-21 00:32:07 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-12-21 00:32:07 +0200 |
| commit | fc1c59ddb407752a85c0b8480b22aec996703604 (patch) | |
| tree | 08a30cd4465202a2ab50c633a6bc9501c2eeee49 | |
| parent | 3039a008dc4d392ec6c7199426f1b0ecd90b8d1a (diff) | |
| parent | 533715ad6f02744267b58ba17be8b275a45c542e (diff) | |
| download | monzero-gui-fc1c59ddb407752a85c0b8480b22aec996703604.tar.gz monzero-gui-fc1c59ddb407752a85c0b8480b22aec996703604.tar.xz monzero-gui-fc1c59ddb407752a85c0b8480b22aec996703604.zip | |
Merge pull request #308
533715a win32/64: build settings (Jaquee)
| -rwxr-xr-x | get_libwallet_api.sh | 7 | ||||
| -rw-r--r-- | monero-wallet-gui.pro | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index bf746cd3..5de993d8 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -61,12 +61,13 @@ elif [ "$platform" == "linux32" ]; then elif [ "$platform" == "mingw64" ]; then # Do something under Windows NT platform echo "Configuring build for MINGW64.." - 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" ../.. + BOOST_ROOT=/mingw64/boost + cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D STATIC=ON -D 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 # Do something under Windows NT platform echo "Configuring build for MINGW32.." - cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D STATIC=ON -D ARCH="i686" -D BUILD_64=OFF -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" -G "MSYS Makefiles" ../.. + BOOST_ROOT=/mingw32/boost + cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D STATIC=ON -D Boost_DEBUG=ON -D BOOST_ROOT="$BOOST_ROOT" -D ARCH="i686" -D BUILD_64=OFF -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" -G "MSYS Makefiles" ../.. make_exec="mingw32-make" else echo "Unsupported platform: $platform" diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro index fe0e6cd9..e190d54e 100644 --- a/monero-wallet-gui.pro +++ b/monero-wallet-gui.pro @@ -91,7 +91,7 @@ win32 { MSYS_PATH=c:/msys32/mingw32 # boost root path - BOOST_PATH=/c/Qt/Qt5.7.0/Tools/mingw530_32/boost + BOOST_PATH=c:/msys32/mingw32/boost } |