aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaquee <jaquee.monero@gmail.com>2016-11-23 22:30:36 +0100
committerJaquee <jaquee.monero@gmail.com>2016-11-23 22:30:36 +0100
commitba1bceb4e0672da743e917d68c3f4f1d02ccd431 (patch)
tree808d32f14dd083d85599315d0794f20e4736b38e
parentc83336cc4714215725cba957d8ea164a57c33987 (diff)
downloadmonzero-gui-ba1bceb4e0672da743e917d68c3f4f1d02ccd431.tar.gz
monzero-gui-ba1bceb4e0672da743e917d68c3f4f1d02ccd431.tar.xz
monzero-gui-ba1bceb4e0672da743e917d68c3f4f1d02ccd431.zip
use mingw32-make on win 32 build
-rwxr-xr-xget_libwallet_api.sh13
1 files changed, 7 insertions, 6 deletions
diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh
index 0de2f19c..76d1123d 100755
--- a/get_libwallet_api.sh
+++ b/get_libwallet_api.sh
@@ -42,7 +42,8 @@ pushd $MONERO_DIR/build/release
# reusing function from "utils.sh"
platform=$(get_platform)
-
+# default make executable
+make_exec="make"
if [ "$platform" == "darwin" ]; then
# Do something under Mac OS X platform
echo "Configuring build for MacOS.."
@@ -59,6 +60,7 @@ 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 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"
popd
@@ -67,9 +69,9 @@ fi
pushd $MONERO_DIR/build/release/src/wallet
-make version -C ../..
-make -j$CPU_CORE_COUNT
-make install -j$CPU_CORE_COUNT
+eval $make_exec version -C ../..
+eval $make_exec -j$CPU_CORE_COUNT
+eval $make_exec install -j$CPU_CORE_COUNT
popd
# unbound is one more dependency. can't be merged to the wallet_merged
@@ -85,5 +87,4 @@ if [ "$platform" != "linux" ]; then
popd
fi
-popd
-
+popd \ No newline at end of file