Skip to content
This repository has been archived by the owner on Feb 12, 2023. It is now read-only.

Commit

Permalink
fix(build): Update toxcore and Qt versions for Windows cross-compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
nurupo committed Sep 22, 2017
1 parent 7f6f8a4 commit 80f1286
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions windows/cross-compile/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@
# - FFmpeg 3.3 doesn't cross-compile correctly, qTox build fails when linking
# against the 3.3 FFmpeg. They have removed `--enable-memalign-hack` switch,
# which might be what causes this.
#
# - Toxcore v0.1.9 doesn't cross-compile to Windows due to a linking order
# issue in monolith_test https://github.com/TokTok/c-toxcore/pull/564. It's
# fixed in master, so we just wait checking out a stable master commit point
# until the next release. Once the next release occurs, we will be checking
# out that instead.


set -euo pipefail
Expand Down Expand Up @@ -238,11 +232,11 @@ then

QT_MAJOR=5
QT_MINOR=6
QT_PATCH=2
QT_PATCH=3

QT_VERSION=$QT_MAJOR.$QT_MINOR.$QT_PATCH
wget $QT_MIRROR/official_releases/qt/$QT_MAJOR.$QT_MINOR/$QT_VERSION/single/qt-everywhere-opensource-src-$QT_VERSION.tar.xz
check_sha256 "83e61bfc78bba230770704e828fa4d23fe3bbfdcfa4a8f5db37ce149731d89b3" "qt-everywhere-opensource-src-$QT_VERSION.tar.xz"
check_sha256 "2fa0cf2e5e8841b29a4be62062c1a65c4f6f2cf1beaf61a5fd661f520cd776d0" "qt-everywhere-opensource-src-$QT_VERSION.tar.xz"
bsdtar -xf qt*.tar.xz
rm qt*.tar.xz
cd qt*
Expand Down Expand Up @@ -772,9 +766,12 @@ then
rm -rf "$TOXCORE_PREFIX_DIR"
mkdir -p "$TOXCORE_PREFIX_DIR"

git clone https://github.com/TokTok/c-toxcore
git clone \
--branch v0.1.10 \
--depth 1 \
https://github.com/TokTok/c-toxcore \
c-toxcore
cd c-toxcore
git checkout 1b290c0d84d92fd28fc1f64f33bf4455d73e2e2e

export PKG_CONFIG_PATH="$OPUS_PREFIX_DIR/lib/pkgconfig:$SODIUM_PREFIX_DIR/lib/pkgconfig:$VPX_PREFIX_DIR/lib/pkgconfig"
export PKG_CONFIG_LIBDIR="/usr/$ARCH-w64-mingw32"
Expand Down

0 comments on commit 80f1286

Please sign in to comment.