diff options
| author | LaserEyess <lasereyess@users.noreply.github.com> | 2022-11-12 09:27:07 -0500 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2023-07-23 19:55:51 +0000 |
| commit | f2cce5f38f4031bf1a4b4919ec90e4e8f8c66a77 (patch) | |
| tree | c5c7f21eb2e1556265655d166ea0bee258376d5b /ci/build-macos.sh | |
| parent | 60a263246e03d23c894ae0ef6bbfa29a5f1855dc (diff) | |
| download | mpv-f2cce5f38f4031bf1a4b4919ec90e4e8f8c66a77.tar.bz2 mpv-f2cce5f38f4031bf1a4b4919ec90e4e8f8c66a77.tar.xz | |
waf: remove waf as a build system
Remove waf entirely in favor of meson as the only supported build
system. Waf was officially deprecated in 0.36.0, and has not been
preferred over meson since 0.35.0.
Diffstat (limited to 'ci/build-macos.sh')
| -rwxr-xr-x | ci/build-macos.sh | 41 |
1 files changed, 10 insertions, 31 deletions
diff --git a/ci/build-macos.sh b/ci/build-macos.sh index 3b3255b8a6..14b3a1b934 100755 --- a/ci/build-macos.sh +++ b/ci/build-macos.sh @@ -10,34 +10,13 @@ if [[ -d "./build/${MPV_VARIANT}" ]] ; then rm -rf "./build/${MPV_VARIANT}" fi -if [[ $1 = "meson" ]]; then - PKG_CONFIG_PATH="${FFMPEG_SYSROOT}/lib/pkgconfig/" CC="${CC}" CXX="${CXX}" \ - meson setup build \ - -Dprefix="${MPV_INSTALL_PREFIX}" \ - -D{libmpv,tests}=true \ - -D{gl,iconv,lcms2,lua,jpeg,plain-gl,zlib}=enabled \ - -D{cocoa,coreaudio,gl-cocoa,macos-cocoa-cb,macos-touchbar,videotoolbox-gl}=enabled - - meson compile -C build -j4 - meson install -C build - ./build/mpv -v --no-config -fi - -if [[ $1 = "waf" ]]; then - if [[ ! -e "./waf" ]] ; then - python3 ./bootstrap.py - fi - - 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} \ - --enable-{cocoa,coreaudio,gl-cocoa,macos-cocoa-cb,macos-touchbar,videotoolbox-gl} \ - --swift-flags="${CI_SWIFT_FLAGS}" - - python3 ./waf build --variant="${MPV_VARIANT}" -j4 - python3 ./waf install --variant="${MPV_VARIANT}" - ${MPV_INSTALL_PREFIX}/bin/mpv -v --no-config -fi +PKG_CONFIG_PATH="${FFMPEG_SYSROOT}/lib/pkgconfig/" CC="${CC}" CXX="${CXX}" \ +meson setup build \ + -Dprefix="${MPV_INSTALL_PREFIX}" \ + -D{libmpv,tests}=true \ + -D{gl,iconv,lcms2,lua,jpeg,plain-gl,zlib}=enabled \ + -D{cocoa,coreaudio,gl-cocoa,macos-cocoa-cb,macos-touchbar,videotoolbox-gl}=enabled + +meson compile -C build -j4 +meson install -C build +./build/mpv -v --no-config |