4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-02-21 17:20:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #289

Browse Source 
e97a211 mac build: target x86-64 (Jaquee)
f74ef30 Fix ubuntu build (Jaquee)
This commit is contained in:
Riccardo Spagni 2016-12-16 01:03:18 +02:00
commit 59ba93bbdd
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -30,7 +30,7 @@ fi
# Platform indepenent settings # Platform indepenent settings
platform=$(get_platform) platform=$(get_platform)
if [ "$platform" == "linux" ]; then if [ "$platform" == "linux32" ] || [ "$platform" == "linux64" ]; then
distro=$(lsb_release -is) distro=$(lsb_release -is)
if [ "$distro" == "Ubuntu" ]; then if [ "$distro" == "Ubuntu" ]; then
CONFIG="$CONFIG libunwind_off" CONFIG="$CONFIG libunwind_off"

4
get_libwallet_api.sh
View File

@ -49,7 +49,7 @@ make_exec="make"
if [ "$platform" == "darwin" ]; then if [ "$platform" == "darwin" ]; then
# Do something under Mac OS X platform # Do something under Mac OS X platform
echo "Configuring build for MacOS.." 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 elif [ "$platform" == "linux64" ]; then
# Do something under GNU/Linux platform # Do something under GNU/Linux platform
echo "Configuring build for Linux.." echo "Configuring build for Linux.."
@ -96,7 +96,7 @@ fi
# since filename conflict (random.c.obj) # since filename conflict (random.c.obj)
# for Linux, we use libunbound shipped with the system, so we don't need to build it # 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..." echo "Building libunbound..."
pushd $MONERO_DIR/build/release/external/unbound pushd $MONERO_DIR/build/release/external/unbound
# no need to make, it was already built as dependency for libwallet # no need to make, it was already built as dependency for libwallet