aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaquee <jaquee.monero@gmail.com>2016-12-21 07:23:05 +0100
committerJaquee <jaquee.monero@gmail.com>2016-12-21 07:23:05 +0100
commit2788b8a7763b0a1b02807eddb2af8b0e6a73d807 (patch)
treeb8b299dd8b4180242311156dc412d47b37e7a1fd
parent4713228d96c5216e703b2b79e3724f645d5c6ad0 (diff)
downloadmonzero-gui-2788b8a7763b0a1b02807eddb2af8b0e6a73d807.tar.gz
monzero-gui-2788b8a7763b0a1b02807eddb2af8b0e6a73d807.tar.xz
monzero-gui-2788b8a7763b0a1b02807eddb2af8b0e6a73d807.zip
Fix libwallet arm7 build
-rwxr-xr-xget_libwallet_api.sh7
-rwxr-xr-xutils.sh4
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.."
diff --git a/utils.sh b/utils.sh
index f04a485c..500e99f0 100755
--- a/utils.sh
+++ b/utils.sh
@@ -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"