diff options
| author | Mario Danic <mario@lovelyhq.com> | 2017-09-21 21:34:19 +0300 |
|---|---|---|
| committer | Mario Danic <mario@lovelyhq.com> | 2017-09-21 21:34:19 +0300 |
| commit | da906fe6934c2f71d0e724da4e0d5416bb2595be (patch) | |
| tree | 0e8d6f70be4b18424ae0935d5a45dcf2a1ef2efe | |
| parent | eb3bba6c642723e06ecb4c2bc8138c6c60fc1668 (diff) | |
Fix Mac compile instructionsfix-mac-compile
Signed-off-by: Mario Danic <mario@lovelyhq.com>
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | osx/build.sh | 6 |
2 files changed, 7 insertions, 7 deletions
@@ -154,12 +154,12 @@ Because the desktop client comes with some custom patches you have to download t ```bash cd /tmp/ -wget http://download.qt.io/official_releases/qt/5.6/5.6.2/single/qt-everywhere-opensource-src-5.6.2.tar.gz -tar -xf qt-everywhere-opensource-src-5.6.2.tar.gz -cd /tmp/qt-everywhere-opensource-src-5.6.2/qtbase +wget http://download.qt.io/official_releases/qt/5.9/5.9.1/single/qt-everywhere-opensource-src-5.9.1.tar.xz +tar -xjf qt-everywhere-opensource-src-5.9.1.tar.xz +cd /tmp/qt-everywhere-opensource-src-5.9.1/qtbase git apply <client>/admin/qt/patches/qtbase/*.patch cd .. -./configure -sdk macosx10.9 -openssl -openssl-linked +./configure -sdk macosx10.9 -openssl -openssl-linked -I /usr/local/opt/openssl/include/ -L /usr/local/opt/openssl/lib/ make -j2 sudo make -j1 install ``` diff --git a/osx/build.sh b/osx/build.sh index 4e3c6a1..1ea498c 100644 --- a/osx/build.sh +++ b/osx/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -export PATH=/usr/local/Qt-5.6.2/bin/:$PATH +export PATH=/usr/local/Qt-5.9.1/bin/:$PATH export OPENSSL_ROOT_DIR=$(brew --prefix openssl) # Cleanup @@ -17,7 +17,7 @@ git submodule update --recursive # Build qtkeychain cd ~/client/src/3rdparty/qtkeychain -cmake -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.8 -DCMAKE_INSTALL_PREFIX=/Users/builder/install -DCMAKE_PREFIX_PATH=/Users/builder/Qt/5.6/clang_64 . +cmake -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.8 -DCMAKE_INSTALL_PREFIX=/Users/builder/install -DCMAKE_PREFIX_PATH=/Users/builder/Qt/5.9/clang_64 . sudo make install # Build the client @@ -26,7 +26,7 @@ cp client_theming/osx/dsa_pub.pem client/admin/osx/sparkle/ rm -rf build-mac mkdir build-mac cd build-mac -cmake -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.8 -DCMAKE_INSTALL_PREFIX=/Users/builder/install -DCMAKE_PREFIX_PATH=/Users/builder/Qt/5.6/clang_64 -D SPARKLE_INCLUDE_DIR=/Users/builder/Library/Frameworks/Sparkle.framework/ -D SPARKLE_LIBRARY=/Users/builder/Library/Frameworks/Sparkle.framework/ -D OEM_THEME_DIR=/Users/builder/client_theming/nextcloudtheme -DWITH_CRASHREPORTER=ON -DNO_SHIBBOLETH=1 -DMIRALL_VERSION_SUFFIX=beta -DMIRALL_VERSION_BUILD=1 ../client +cmake -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.8 -DCMAKE_INSTALL_PREFIX=/Users/builder/install -DCMAKE_PREFIX_PATH=/Users/builder/Qt/5.9/clang_64 -D SPARKLE_INCLUDE_DIR=/Users/builder/Library/Frameworks/Sparkle.framework/ -D SPARKLE_LIBRARY=/Users/builder/Library/Frameworks/Sparkle.framework/ -D OEM_THEME_DIR=/Users/builder/client_theming/nextcloudtheme -DWITH_CRASHREPORTER=ON -DNO_SHIBBOLETH=1 -DMIRALL_VERSION_SUFFIX=beta -DMIRALL_VERSION_BUILD=1 ../client make sudo make install sudo ~/client_theming/client/admin/osx/sign_app.sh ~/install/nextcloud.app 59FA8948AEBAE3F2222AE9BC020D6DA31DF821A7 |