diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-04 17:47:27 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-04 17:47:27 +0200 |
| commit | 99230e3ff14546db9a728fd3a7696d45a01a2368 (patch) | |
| tree | 8b5b860af26e137416c5ade623abf7b200e0662f | |
| parent | 739d24efb4864a84f9b6bfac34dc804e26bde77b (diff) | |
| parent | 7ab337333541ce02f19933f5eff226ae976104e9 (diff) | |
| download | monzero-gui-99230e3ff14546db9a728fd3a7696d45a01a2368.tar.gz monzero-gui-99230e3ff14546db9a728fd3a7696d45a01a2368.tar.xz monzero-gui-99230e3ff14546db9a728fd3a7696d45a01a2368.zip | |
Merge pull request #443
7ab3373 use gmake on bsd in build.sh (pigeons)
| -rwxr-xr-x | build.sh | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -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 |