diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2017-01-30 16:05:43 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2017-01-30 16:05:43 -0600 |
| commit | 1ef1a140b77aa5233e16b547c45ed8dd893e0cde (patch) | |
| tree | 22f43f28c996bf64d8dc35ae9191aa69219acf71 | |
| parent | cf9574243331841957943df1565082b22c54b46d (diff) | |
| parent | a81a071d2db5160a698c1d7f60194508f53a574b (diff) | |
| download | monzero-gui-1ef1a140b77aa5233e16b547c45ed8dd893e0cde.tar.gz monzero-gui-1ef1a140b77aa5233e16b547c45ed8dd893e0cde.tar.xz monzero-gui-1ef1a140b77aa5233e16b547c45ed8dd893e0cde.zip | |
Merge pull request #439
a81a071 fix osx build (Jaqueeee)
| -rwxr-xr-x | build.sh | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -1,6 +1,8 @@ #!/bin/bash BUILD_TYPE=$1 +source ./utils.sh +platform=$(get_platform) # default build type if [ -z $BUILD_TYPE ]; then BUILD_TYPE=release @@ -12,7 +14,13 @@ if [ "$BUILD_TYPE" == "release" ]; then BIN_PATH=release/bin elif [ "$BUILD_TYPE" == "release-static" ]; then echo "Building release-static" - CONFIG="CONFIG+=release static"; + if [ "$platform" != "darwin" ]; then + CONFIG="CONFIG+=release static"; + else + # OS X: build static libwallet but dynamic Qt. + echo "OS X: Building Qt project without static flag" + CONFIG="CONFIG+=release"; + fi BIN_PATH=release/bin elif [ "$BUILD_TYPE" == "release-android" ]; then echo "Building release for ANDROID" @@ -50,7 +58,6 @@ if [ ! -d build ]; then mkdir build; fi # Platform indepenent settings -platform=$(get_platform) if [ "$ANDROID" != true ] && ([ "$platform" == "linux32" ] || [ "$platform" == "linux64" ]); then distro=$(lsb_release -is) if [ "$distro" == "Ubuntu" ]; then |