diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-12-15 17:19:08 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-12-15 17:19:08 +0200 |
| commit | a241f0f8f8b93471971bc3edee7af35813416ff8 (patch) | |
| tree | 959a61f4e80ff5d99ff5b6412ceb0e6e8b009b06 | |
| parent | 69625015a006bb54d3caa3c8fb730c1ede2d6974 (diff) | |
| parent | 05a6f9cb6d794065499158b56c3c8f897c3b18bf (diff) | |
| download | monzero-gui-a241f0f8f8b93471971bc3edee7af35813416ff8.tar.gz monzero-gui-a241f0f8f8b93471971bc3edee7af35813416ff8.tar.xz monzero-gui-a241f0f8f8b93471971bc3edee7af35813416ff8.zip | |
Merge pull request #287
05a6f9c build settings for linux x86/x64 (Jaquee)
| -rwxr-xr-x | get_libwallet_api.sh | 8 | ||||
| -rwxr-xr-x | utils.sh | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index 6d41b502..9c5ef3f7 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -50,10 +50,14 @@ 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" ../.. -elif [ "$platform" == "linux" ]; then +elif [ "$platform" == "linux64" ]; then # Do something under GNU/Linux platform echo "Configuring build for Linux.." - cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -D STATIC=ON -D BUILD_GUI_DEPS=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 CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../.. +elif [ "$platform" == "linux32" ]; then + # Do something under GNU/Linux platform + echo "Configuring build for Linux.." + 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" == "mingw64" ]; then # Do something under Windows NT platform echo "Configuring build for MINGW64.." @@ -6,7 +6,11 @@ function get_platform { if [ "$(uname)" == "Darwin" ]; then platform="darwin" elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then - platform="linux" + if [ "$(expr substr $(uname -m) 1 6)" == "x86_64" ]; then + platform="linux64" + else + platform="linux32" + fi elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW64_NT" ]; then platform="mingw64" elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW32_NT" ]; then |