aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2018-12-03 01:06:32 -0600
committerluigi1111 <luigi1111w@gmail.com>2018-12-03 01:06:32 -0600
commitb5722cfce21a91347bd6dc4bf522c34f2c9a4e17 (patch)
tree91cfd8febefc67ccb42238236c50ea24796e031f
parent72808de1ad3b8b8e9fd5a397e2b615e49af4b202 (diff)
parentbbc790a981d31841452c8f70e8d6b6946a45274e (diff)
downloadmonzero-gui-b5722cfce21a91347bd6dc4bf522c34f2c9a4e17.tar.gz
monzero-gui-b5722cfce21a91347bd6dc4bf522c34f2c9a4e17.tar.xz
monzero-gui-b5722cfce21a91347bd6dc4bf522c34f2c9a4e17.zip
Merge pull request #1753
bbc790a get_libwallet_api: configure cmake toolchain for msys (stoffu)
-rwxr-xr-xget_libwallet_api.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh
index a38b2960..73704542 100755
--- a/get_libwallet_api.sh
+++ b/get_libwallet_api.sh
@@ -188,14 +188,14 @@ elif [ "$platform" == "mingw64" ]; then
# Do something under Windows NT platform
echo "Configuring build for MINGW64.."
BOOST_ROOT=/mingw64/boost
- cmake -D CMAKE_BUILD_TYPE=$CMAKE_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" ../..
+ cmake -D CMAKE_BUILD_TYPE=$CMAKE_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" -D CMAKE_TOOLCHAIN_FILE=../../cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=c:/msys64 ../..
## Windows 32
elif [ "$platform" == "mingw32" ]; then
# Do something under Windows NT platform
echo "Configuring build for MINGW32.."
BOOST_ROOT=/mingw32/boost
- cmake -D CMAKE_BUILD_TYPE=$CMAKE_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" ../..
+ cmake -D CMAKE_BUILD_TYPE=$CMAKE_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" -D CMAKE_TOOLCHAIN_FILE=../../cmake/32-bit-toolchain.cmake -D MSYS2_FOLDER=c:/msys32 ../..
make_exec="mingw32-make"
else
echo "Unknown platform, configuring general build"