diff --git a/build-jack.sh b/build-jack.sh index c0dced5..1b2a962 100755 --- a/build-jack.sh +++ b/build-jack.sh @@ -96,6 +96,14 @@ build_custom_db db "${DB_VERSION}" "--disable-java --disable-replication --disab download opus "${OPUS_VERSION}" "https://archive.mozilla.org/pub/opus" build_autoconf opus "${OPUS_VERSION}" "--disable-extra-programs --enable-custom-modes --enable-float-approx" +# --------------------------------------------------------------------------------------------------------------------- +# tre (win32 only) + +if [ "${WIN32}" -eq 1 ]; then + download tre "${TRE_VERSION}" "https://laurikari.net/tre" + build_autoconf tre "${TRE_VERSION}" "--disable-nls" +fi + # --------------------------------------------------------------------------------------------------------------------- # and finally jack2 @@ -108,6 +116,15 @@ jack2_args="--prefix=\"${PAWPAW_PREFIX}/jack2\"" # if [ "${MACOS_OLD}" -eq 1 ] || [ "${WIN32}" -eq 1 ]; then # jack2_args="${jack2_args} --mixed" # fi +if [ "${CROSS_COMPILING}" -eq 1 ]; then + if [ "${LINUX}" -eq 1 ]; then + jack2_args="${jack2_args} --platform=linux" + elif [ "${MACOS}" -eq 1 ]; then + jack2_args="${jack2_args} --platform=darwin" + elif [ "${WIN32}" -eq 1 ]; then + jack2_args="${jack2_args} --platform=win32" + fi +fi ln -sf "$(pwd)/jack2" "${PAWPAW_BUILDDIR}/jack2-git" rm -f "${PAWPAW_BUILDDIR}/jack2-git/.stamp_built" diff --git a/setup/versions.sh b/setup/versions.sh index 2d230d8..b63c505 100644 --- a/setup/versions.sh +++ b/setup/versions.sh @@ -16,6 +16,7 @@ FFTW_VERSION=3.3.8 AFTEN_VERSION=0.0.8 DB_VERSION=5.3.28 OPUS_VERSION=1.3.1 +TRE_VERSION=0.8.0 # GLIB_VERSION=2.44.1 # GLIB_MVERSION=2.44