diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-12-21 09:26:32 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-12-21 09:26:32 +0200 |
| commit | bbbffd58f469397095bdf0ddee6439b55ffb2dcf (patch) | |
| tree | efea8a3f5e732cdc596229f6c45895aea54380ec | |
| parent | 88a5e3f1ab18d84a1960cd4d5aed7fb0259525a4 (diff) | |
| parent | 2788b8a7763b0a1b02807eddb2af8b0e6a73d807 (diff) | |
| download | monzero-gui-bbbffd58f469397095bdf0ddee6439b55ffb2dcf.tar.gz monzero-gui-bbbffd58f469397095bdf0ddee6439b55ffb2dcf.tar.xz monzero-gui-bbbffd58f469397095bdf0ddee6439b55ffb2dcf.zip | |
Merge pull request #318
2788b8a Fix libwallet arm7 build (Jaquee)
| -rwxr-xr-x | get_libwallet_api.sh | 7 | ||||
| -rwxr-xr-x | utils.sh | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index 5de993d8..534d92c9 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -52,12 +52,15 @@ if [ "$platform" == "darwin" ]; then 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.." + echo "Configuring build for Linux x64" cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D STATIC=ON -D ARCH="x86-64" -D BUILD_64=ON -D BUILD_GUI_DEPS=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. elif [ "$platform" == "linux32" ]; then # Do something under GNU/Linux platform - echo "Configuring build for Linux.." + echo "Configuring build for Linux i686" cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D STATIC=ON -D ARCH="i686" -D BUILD_64=OFF -D BUILD_GUI_DEPS=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. +elif [ "$platform" == "linux" ]; then + echo "Configuring build for Linux general" + cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D STATIC=ON -D BUILD_GUI_DEPS=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. elif [ "$platform" == "mingw64" ]; then # Do something under Windows NT platform echo "Configuring build for MINGW64.." @@ -8,8 +8,10 @@ function get_platform { elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then if [ "$(expr substr $(uname -m) 1 6)" == "x86_64" ]; then platform="linux64" - else + elif [ "$(expr substr $(uname -m) 1 4)" == "i686" ]; then platform="linux32" + else + platform="linux" fi elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW64_NT" ]; then platform="mingw64" |