diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-12-16 01:03:18 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-12-16 01:03:18 +0200 |
| commit | 59ba93bbddeec4db62f4bc1e0e29e42995188fb6 (patch) | |
| tree | 58afebb774b8a51b2c780e3bb162710ebbf812c4 | |
| parent | 553d39aa2c1fec1924bd9f8e3d8a7a834e65baa2 (diff) | |
| parent | e97a2115d95d3d33f7935402322047651725fe6f (diff) | |
| download | monzero-gui-59ba93bbddeec4db62f4bc1e0e29e42995188fb6.tar.gz monzero-gui-59ba93bbddeec4db62f4bc1e0e29e42995188fb6.tar.xz monzero-gui-59ba93bbddeec4db62f4bc1e0e29e42995188fb6.zip | |
Merge pull request #289
e97a211 mac build: target x86-64 (Jaquee)
f74ef30 Fix ubuntu build (Jaquee)
| -rwxr-xr-x | build.sh | 2 | ||||
| -rwxr-xr-x | get_libwallet_api.sh | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -30,7 +30,7 @@ fi # Platform indepenent settings platform=$(get_platform) -if [ "$platform" == "linux" ]; then +if [ "$platform" == "linux32" ] || [ "$platform" == "linux64" ]; then distro=$(lsb_release -is) if [ "$distro" == "Ubuntu" ]; then CONFIG="$CONFIG libunwind_off" diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index 9c5ef3f7..bf746cd3 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -49,7 +49,7 @@ make_exec="make" if [ "$platform" == "darwin" ]; then # Do something under Mac OS X platform echo "Configuring build for MacOS.." - 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" ../.. + cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D STATIC=ON -D ARCH="x86-64" -D BUILD_64=ON -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. elif [ "$platform" == "linux64" ]; then # Do something under GNU/Linux platform echo "Configuring build for Linux.." @@ -96,7 +96,7 @@ fi # since filename conflict (random.c.obj) # for Linux, we use libunbound shipped with the system, so we don't need to build it -if [ "$platform" != "linux" ]; then +if [ "$platform" != "linux32" ] && [ "$platform" != "linux64" ]; then echo "Building libunbound..." pushd $MONERO_DIR/build/release/external/unbound # no need to make, it was already built as dependency for libwallet |