StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

chore(build): allow osx mac deployer ultimate script outside of home

Browse Source 
Also update toxcore build to cmake
This commit is contained in:
Anthony Bilinski 2018-07-22 16:32:48 -07:00
parent 7c496d425b
commit 5cc56c82f5
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osx/qTox-Mac-Deployer-ULTIMATE.sh
View File

@ -32,7 +32,8 @@ then
MAIN_DIR="${TRAVIS_BUILD_DIR}"
QTOX_DIR="${MAIN_DIR}"
else
MAIN_DIR="/Users/${USER}"
# the directory which qTox is cloned in, wherever that is
MAIN_DIR="$(dirname $(readlink -f $0))/../.."
QTOX_DIR="${MAIN_DIR}/qTox${SUBGIT}"
fi
QT_DIR="/usr/local/Cellar/qt5" # Folder name of QT install
@ -70,11 +71,10 @@ build_toxcore() {
[[ $TRAVIS != true ]] \
&& sleep 3
autoreconf -if
mkdir _build && cd _build
fcho "Starting cmake ..."
#Make sure the correct version of libsodium is used
./configure --with-libsodium-headers="${LS_DIR_VER}/include/" --with-libsodium-libs="${LS_DIR_VER}/lib/" --prefix="${LIB_INSTALL_PREFIX}"
cmake -DBOOTSTRAP_DAEMON=OFF -DLIBSODIUM_CFLAGS="-I${LS_DIR_VER}/include/" -DLIBSODIUM_LDFLAGS="L${LS_DIR_VER}/lib/" -DCMAKE_INSTALL_PREFIX="${LIB_INSTALL_PREFIX}" ..
make clean &> /dev/null
fcho "Compiling toxcore."
make > /dev/null || exit 1
@ -112,7 +112,7 @@ install() {
if [[ $TRAVIS != true ]]
then
sleep 3
brew install git wget libtool autoconf automake pkgconfig
brew install git wget libtool cmake pkgconfig
fi
brew install check libvpx opus libsodium