diff --git a/1-setup-windows-msys2.sh b/1-setup-windows-msys2.sh old mode 100644 new mode 100755 index 79f48ea..79f48ea --- a/1-setup-windows-msys2.sh +++ b/1-setup-windows-msys2.sh diff --git a/autobuild/build.sh b/autobuild/build.sh index 4f7e382..a19567e 100755 --- a/autobuild/build.sh +++ b/autobuild/build.sh @@ -63,11 +63,10 @@ else DEBUG='' fi -[ -d ETL ] || mkdir ETL -[ -d synfig-core ] || mkdir synfig-core -[ -d synfig-studio ] || mkdir synfig-studio -[ -d "${PREFIX}" ] || mkdir "${PREFIX}" -[ -d "${PREFIX}/bin" ] || mkdir "${PREFIX}/bin" +mkdir -p ETL +mkdir -p synfig-core +mkdir -p synfig-studio +mkdir -p "${PREFIX}/bin" #========================== VARIABLES ================================== diff --git a/autobuild/msys2/build_mlt.sh b/autobuild/msys2/build_mlt.sh index a05fe72..ed2a053 100644 --- a/autobuild/msys2/build_mlt.sh +++ b/autobuild/msys2/build_mlt.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # ------------------------------------------------------------------------------- -# This script builds mlt++ required by synfig-core +# This script builds mlt++ on MSYS2 required by synfig-core # ------------------------------------------------------------------------------- set -e # exit on error @@ -11,24 +11,26 @@ source ${SCRIPT_DIR}/set_env.sh VERSION_MLT="6.16.0" PATH="${PREFIX}/lib/ccache/bin:${PATH}" +MLT_PATH="/opt/mlt-${VERSION_MLT}" -if [ ! -f /opt/mlt-${VERSION_MLT}/done ]; then +if [ ! -f ${MLT_PATH}/done ]; then echo " ======================= Compiling MLT++ ======================= " -mkdir -p /opt/mlt-${VERSION_MLT}/ +mkdir -p ${MLT_PATH} -cd /tmp +pushd /tmp wget "https://github.com/mltframework/mlt/releases/download/v${VERSION_MLT}/mlt-${VERSION_MLT}.tar.gz" tar xzf ./mlt-${VERSION_MLT}.tar.gz pushd mlt-${VERSION_MLT}/ -echo "Install path: ${PREFIX}" -./configure --prefix=/opt/mlt-${VERSION_MLT} --target-arch=$MSYS2_ARCH --disable-gtk2 +echo "Install path: ${MLT_PATH}" +./configure --prefix=${MLT_PATH} --target-arch=$MSYS2_ARCH --disable-gtk2 make -j2 --silent make install popd -touch /opt/mlt-${VERSION_MLT}/done +touch ${MLT_PATH}/done +popd fi