fix ci

appveyor.yml

@@ -1,8 +1,5 @@
 environment:
   matrix:
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-    OBS_VER: "26.1.2"
-
   - APPVEYOR_BUILD_WORKER_IMAGE: macos
   - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
 
@@ -15,7 +12,7 @@ for:
   - ci/install_macos.sh
 
   build_script:
-  - ./build_macos.sh
+  - QTDIR=$HOME/Qt/5.15.2/clang_64 ./build_macos.sh
 
   artifacts:
   - path: "*.pkg"
@@ -28,8 +25,7 @@ for:
   - ci/install_ubuntu.sh
 
   build_script:
-  - sed -i 's/CMAKE_CXX_STANDARD 17/CMAKE_CXX_STANDARD 11/' CMakeLists.txt
-  - QTDIR=$HOME/Qt/5.14/gcc_64 ./build_linux.sh
+  - QTDIR=$HOME/Qt/5.15.2/gcc_64 ./build_linux.sh
 
   artifacts:
   - path: "*.tar.xz"

build_macos.sh

@@ -5,8 +5,13 @@ set -eux
 : "${INSTALL:=0}"
 : "${DESTDIR:=/Library/Application Support}"
 : "${QTDIR:=/usr/local/opt/qt}"
-: "${OBS_BIN_DIR:=/Applications/OBS.app/Contents/MacOS}"
-: "${OBS_SRC_DIR:=../obs-studio-25.0.8}"
+: "${OBS_BIN_DIR:=/Applications/OBS.app}"
+
+obs_ver=$("$OBS_BIN_DIR/Contents/MacOS/obs" -V)
+obs_ver=${obs_ver//-/ }
+obs_ver=($obs_ver)
+obs_ver=${obs_ver[2]}
+: "${OBS_SRC_DIR:=../obs-studio-$obs_ver}"
 
 lib_path="dist/$DESTDIR/obs-studio/plugins/obs-multi-rtmp/bin/obs-multi-rtmp.so"
 
@@ -19,7 +24,7 @@ ver=${ver:0:$ver_len}
 
 rm -fr build dist *.pkg
 
-cmake -DCMAKE_INSTALL_PREFIX="$DESTDIR" -DQTDIR="$QTDIR" -DOBS_BIN_DIR="$OBS_BIN_DIR" -DOBS_SRC_DIR="$OBS_SRC_DIR" -B build .
+cmake -DCMAKE_INSTALL_PREFIX="$DESTDIR" -DQTDIR="$QTDIR" -DOBS_BIN_DIR="$OBS_BIN_DIR/Contents/Frameworks" -DOBS_SRC_DIR="$OBS_SRC_DIR" -B build .
 cmake --build build --config Release
 cmake --install build --config Release --prefix "dist/$DESTDIR"
 

ci/install_macos.sh

@@ -6,9 +6,7 @@ set -eux
 : "${OBS_SRC_DIR:=../}"
 : "${OBS_SRC_URL:=https://github.com/obsproject/obs-studio/archive/#OBS_VER#.tar.gz}"
 
-brew install https://github.com/Homebrew/homebrew-core/raw/8846805afc0cb8e5d114d5e222af1de3b35289df/Formula/qt.rb
-brew pin qt
-brew cask install packages obs
+brew install packages obs
 
 obs_ver=$("$OBS_BIN" -V)
 obs_ver=${obs_ver//-/ }