diff --git a/ci/build-freebsd.sh b/ci/build-freebsd.sh index 9cea4124e1..cefa6c2013 100755 --- a/ci/build-freebsd.sh +++ b/ci/build-freebsd.sh @@ -30,6 +30,7 @@ if [ ! -e "./waf" ] ; then fi python3 ./waf configure \ + --out=build_waf \ --enable-libmpv-shared \ --enable-lua \ --enable-egl-drm \ diff --git a/ci/build-macos.sh b/ci/build-macos.sh index f7d704a743..cb465b3f51 100755 --- a/ci/build-macos.sh +++ b/ci/build-macos.sh @@ -32,6 +32,7 @@ if [[ $1 = "waf" ]]; then PKG_CONFIG_PATH="${FFMPEG_SYSROOT}/lib/pkgconfig/" CC="${CC}" CXX="${CXX}" python3 \ ./waf configure \ + --out=build_waf \ --variant="${MPV_VARIANT}" \ --prefix="${MPV_INSTALL_PREFIX}" \ --enable-{gl,iconv,lcms2,libmpv-shared,lua,jpeg,plain-gl,zlib} \ @@ -41,5 +42,5 @@ if [[ $1 = "waf" ]]; then python3 ./waf build --variant="${MPV_VARIANT}" -j4 python3 ./waf install --variant="${MPV_VARIANT}" - ./build/mpv + ${MPV_INSTALL_PREFIX}/bin/mpv fi diff --git a/ci/build-mingw64.sh b/ci/build-mingw64.sh index 43d5ea1d40..d97e6ace4a 100755 --- a/ci/build-mingw64.sh +++ b/ci/build-mingw64.sh @@ -207,6 +207,7 @@ if [ "$1" = "meson" ]; then meson test -C build elif [ "$1" = "waf" ]; then PKG_CONFIG=pkg-config ./waf configure \ + --out=build_waf \ --enable-libmpv-shared --lua=luajit \ --enable-{shaderc,spirv-cross,d3d11,libplacebo,tests} @@ -216,7 +217,7 @@ fi if [ "$2" = pack ]; then mkdir -p artifact echo "Copying:" - cp -pv build/mpv.{com,exe} "$prefix_dir/bin/"*.dll artifact/ + cp -pv build_waf/mpv.{com,exe} "$prefix_dir/bin/"*.dll artifact/ # ship everything and the kitchen sink shopt -s nullglob for file in /usr/lib/gcc/$TARGET/*-posix/*.dll /usr/$TARGET/lib/*.dll; do diff --git a/ci/build-msys2.sh b/ci/build-msys2.sh index 8213389005..7223a538aa 100755 --- a/ci/build-msys2.sh +++ b/ci/build-msys2.sh @@ -1,7 +1,7 @@ #!/bin/sh -e if [ "$1" = "meson" ]; then - meson setup build_meson \ + meson setup build \ -D cdda=enabled \ -D d3d-hwaccel=enabled \ -D d3d11=enabled \ @@ -22,15 +22,16 @@ if [ "$1" = "meson" ]; then -D uchardet=enabled \ -D vapoursynth=enabled \ -D vulkan=enabled - meson compile -C build_meson - cp ./build_meson/generated/mpv.com ./build_meson - meson test -C build_meson - ./build_meson/mpv.com --no-config -v --unittest=all-simple + meson compile -C build + cp ./build/generated/mpv.com ./build + meson test -C build + ./build/mpv.com --no-config -v --unittest=all-simple fi if [ "$1" = "waf" ]; then ./bootstrap.py ./waf configure \ + --out=build_waf \ --enable-cdda \ --enable-d3d-hwaccel \ --enable-d3d11 \ @@ -52,5 +53,5 @@ if [ "$1" = "waf" ]; then --lua=luajit \ --enable-vulkan ./waf build - ./build/mpv.com -v --no-config -v --unittest=all-simple + ./build_waf/mpv.com -v --no-config -v --unittest=all-simple fi diff --git a/ci/build-tumbleweed.sh b/ci/build-tumbleweed.sh index 355ccd92e6..48b464b594 100755 --- a/ci/build-tumbleweed.sh +++ b/ci/build-tumbleweed.sh @@ -19,7 +19,8 @@ if [ "$1" = "meson" ]; then fi if [ "$1" = "waf" ]; then - python3 ./waf configure \ + python3 ./waf configure \ + --out=build_waf \ --enable-cdda \ --enable-dvbin \ --enable-dvdnav \ @@ -31,5 +32,5 @@ if [ "$1" = "waf" ]; then --enable-tests \ --enable-vulkan python3 ./waf build - ./build/mpv -v --no-config -v --unittest=all-simple + ./build_waf/mpv -v --no-config -v --unittest=all-simple fi