1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Use filter_audio Makefile, bump sodium version

May help with #1128
@novist bootstrap.sh no longer calls install_libfilteraudio.sh, I'd like you to fix Windows as necessary (I have no idea if the filter_audio Makefile supports Windows or not). I'd like to remove install_libfilteraudio.sh if possible.
This commit is contained in:
Dubslow 2015-02-17 22:08:12 -06:00
parent ec6bed5a99
commit 15dcff6d2d
No known key found for this signature in database
GPG Key ID: 3DB8E05315C220AA

View File

@ -17,7 +17,7 @@ INSTALL_DIR=libs
# just for convenience # just for convenience
BASE_DIR=${SCRIPT_DIR}/${INSTALL_DIR} BASE_DIR=${SCRIPT_DIR}/${INSTALL_DIR}
SODIUM_VER=1.0.0 SODIUM_VER=1.0.2
# directory names of cloned repositories # directory names of cloned repositories
SODIUM_DIR=libsodium-$SODIUM_VER SODIUM_DIR=libsodium-$SODIUM_VER
@ -136,10 +136,13 @@ if [[ $TOX_ONLY = "false" ]]; then
popd popd
if [[ $GLOBAL = "false" ]]; then git clone https://github.com/irungentoo/filter_audio.git ${BASE_DIR}/${FILTER_AUDIO_DIR}
./install_libfilteraudio.sh ${BASE_DIR}/${FILTER_AUDIO_DIR} ${BASE_DIR} pushd ${BASE_DIR}/${FILTER_AUDIO_DIR}
make
if [[ $GLOBAL = "false" || $EUID -eq 0 ]]; then
cp filter_audio.h libfilteraudio.* ${BASE_DIR}
else else
./install_libfilteraudio.sh ${BASE_DIR}/${FILTER_AUDIO_DIR} sudo make install
fi fi
fi fi