Merge pull request #287

05a6f9c build settings for linux x86/x64 (Jaquee)
This commit is contained in:
Riccardo Spagni 2016-12-15 17:19:08 +02:00
commit a241f0f8f8
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 11 additions and 3 deletions

View file

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

View file

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