Merge pull request #443

7ab3373 use gmake on bsd in build.sh (pigeons)
This commit is contained in:
Riccardo Spagni 2017-02-04 17:47:27 +02:00
commit 99230e3ff1
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -48,11 +48,16 @@ ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
MONERO_DIR=monero
MONEROD_EXEC=monerod
MAKE='make'
if [[ $platform == *bsd* ]]; then
MAKE='gmake'
fi
# build libwallet
$SHELL get_libwallet_api.sh $BUILD_TYPE
# build zxcvbn
make -C src/zxcvbn-c
$MAKE -C src/zxcvbn-c || exit
if [ ! -d build ]; then mkdir build; fi
@ -80,8 +85,8 @@ popd
echo "var GUI_MONERO_VERSION = \"$VERSIONTAG\"" >> version.js
cd build
qmake ../monero-wallet-gui.pro "$CONFIG"
make
qmake ../monero-wallet-gui.pro "$CONFIG" || exit
$MAKE || exit
# Copy monerod to bin folder
if [ "$platform" != "mingw32" ] && [ "$ANDROID" != true ]; then