1
mirror of https://github.com/monero-project/monero-gui synced 2024-11-15 15:16:57 +01:00

Merge pull request #318

2788b8a Fix libwallet arm7 build (Jaquee)
This commit is contained in:
Riccardo Spagni 2016-12-21 09:26:32 +02:00
commit bbbffd58f4
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 8 additions and 3 deletions

View File

@ -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.."

View File

@ -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"