From 68ae9460d5b1f363a30d78c67b13d36c53a31b33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20=C5=BBy=C5=BAniewski?= <zyzniewski@gmail.com>
Date: Thu, 29 Dec 2022 10:29:58 +0100
Subject: [PATCH] ci: update obs-plugintemplate

---
 .cmake-format.json                            |  22 +-
 .github/scripts/.build.zsh                    | 149 ++-
 .github/scripts/.package.zsh                  |  44 +-
 .github/scripts/Build-Windows.ps1             |  69 +-
 .github/scripts/Package-Windows.ps1           |   4 +-
 .github/scripts/check-cmake.sh                |   6 +-
 .github/scripts/check-format.sh               |  18 +-
 .../scripts/utils.pwsh/Expand-ArchiveExt.ps1  |  12 +-
 .../scripts/utils.pwsh/Invoke-GitCheckout.ps1 |   2 +-
 .github/scripts/utils.pwsh/Setup-Host.ps1     | 151 ++-
 .github/scripts/utils.pwsh/Setup-Obs.ps1      |  77 +-
 .github/scripts/utils.zsh/check_linux         |  37 +-
 .github/scripts/utils.zsh/check_macos         |   6 +-
 .github/scripts/utils.zsh/check_packages      |   1 +
 .github/scripts/utils.zsh/check_xcnotary      |   9 -
 .github/scripts/utils.zsh/read_codesign_pass  |   6 +-
 .github/scripts/utils.zsh/setup_linux         |  87 +-
 .github/scripts/utils.zsh/setup_macos         | 157 +--
 .github/scripts/utils.zsh/setup_obs           | 133 +--
 .github/workflows/main.yml                    |  65 +-
 CMakeLists.txt                                |  81 +-
 buildspec.json                                | 110 +-
 cmake/ObsPluginHelpers.cmake                  | 555 +++++++---
 cmake/bundle/macos/installer-macOS.pkgproj.in | 947 ------------------
 cmake/bundle/windows/installer-Windows.iss.in |   1 +
 25 files changed, 1123 insertions(+), 1626 deletions(-)
 delete mode 100644 .github/scripts/utils.zsh/check_xcnotary
 delete mode 100644 cmake/bundle/macos/installer-macOS.pkgproj.in

diff --git a/.cmake-format.json b/.cmake-format.json
index 0ccd9bf..eb7d554 100644
--- a/.cmake-format.json
+++ b/.cmake-format.json
@@ -1,14 +1,16 @@
 {
-    "additional_commands": {
-      "find_qt": {
-        "flags": [],
-        "kwargs": {
-          "VERSION": "+",
-          "COMPONENTS": "+",
-          "COMPONENTS_WIN": "+",
-          "COMPONENTS_MACOS": "+",
-          "COMPONENTS_LINUX": "+"
-        }
+  "additional_commands": {
+    "find_qt": {
+      "flags": [],
+      "kwargs": {
+        "COMPONENTS": "+",
+        "COMPONENTS_WIN": "+",
+        "COMPONENTS_MACOS": "+",
+        "COMPONENTS_LINUX": "+"
       }
     }
+  },
+  "format": {
+    "line_width": 100
+  }
 }
diff --git a/.github/scripts/.build.zsh b/.github/scripts/.build.zsh
index 40b411e..a85e19a 100755
--- a/.github/scripts/.build.zsh
+++ b/.github/scripts/.build.zsh
@@ -12,9 +12,9 @@ setopt NO_PUSHD_IGNORE_DUPS
 setopt FUNCTION_ARGZERO
 
 ## Enable for script debugging
-#setopt WARN_CREATE_GLOBAL
-#setopt WARN_NESTED_VAR
-#setopt XTRACE
+# setopt WARN_CREATE_GLOBAL
+# setopt WARN_NESTED_VAR
+# setopt XTRACE
 
 autoload -Uz is-at-least && if ! is-at-least 5.2; then
   print -u2 -PR "%F{1}${funcstack[1]##*/}:%f Running on Zsh version %B${ZSH_VERSION}%b, but Zsh %B5.2%b is the minimum supported version. Upgrade Zsh to fix this issue."
@@ -36,20 +36,37 @@ build() {
   local target="${host_os}-${CPUTYPE}"
   local project_root=${SCRIPT_HOME:A:h:h}
   local buildspec_file="${project_root}/buildspec.json"
+
   trap '_trap_error' ZERR
 
   fpath=("${SCRIPT_HOME}/utils.zsh" ${fpath})
   autoload -Uz log_info log_error log_output set_loglevel check_${host_os} setup_${host_os} setup_obs setup_ccache
 
+  if [[ ! -r ${buildspec_file} ]] {
+    log_error \
+      'No buildspec.json found. Please create a build specification for your project.' \
+      'A buildspec.json.template file is provided in the repository to get you started.'
+    return 2
+  }
+
+  typeset -g -a skips=()
   local -i _verbosity=1
-  local -r _version='0.0.1'
+  local -r _version='1.0.0'
   local -r -a _valid_targets=(
     macos-x86_64
     macos-arm64
     macos-universal
     linux-x86_64
+    linux-aarch64
   )
   local -r -a _valid_configs=(Debug RelWithDebInfo Release MinSizeRel)
+  if [[ ${host_os} == 'macos' ]] {
+    local -r -a _valid_generators=(Xcode Ninja 'Unix Makefiles')
+    local generator="${${CI:+Ninja}:-Xcode}"
+  } else {
+    local -r -a _valid_generators=(Ninja 'Unix Makefiles')
+    local generator='Ninja'
+  }
   local -r _usage="
 Usage: %B${functrace[1]%:*}%b <option> [<options>]
 
@@ -60,11 +77,18 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
   %B-t | --target%b                     Specify target - default: %B%F{green}${host_os}-${CPUTYPE}%f%b
   %B-c | --config%b                     Build configuration - default: %B%F{green}RelWithDebInfo%f%b
   %B-s | --codesign%b                   Enable codesigning (macOS only)
+  %B--generator%b                       Specify build system to generate - default: %B%F{green}Ninja%f%b
+                                    Available generators:
+                                      - Ninja
+                                      - Unix Makefiles
+                                      - Xcode (macOS only)
 
 %F{yellow} Output options%f
  -----------------------------------------------------------------------------
   %B-q | --quiet%b                      Quiet (error output only)
   %B-v | --verbose%b                    Verbose (more detailed output)
+  %B--skip-[all|build|deps|unpack]%b    Skip all|building OBS|checking for dependencies|unpacking dependencies
+  %B--debug%b                           Debug (very detailed and added output)
 
 %F{yellow} General options%f
  -----------------------------------------------------------------------------
@@ -74,7 +98,7 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
   local -a args
   while (( # )) {
     case ${1} {
-      -t|--target|-c|--config)
+      -t|--target|-c|--config|--generator)
         if (( # == 1 )) || [[ ${2:0:1} == '-' ]] {
           log_error "Missing value for option %B${1}%b"
           log_output ${_usage}
@@ -112,6 +136,22 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
       -h|--help) log_output ${_usage}; exit 0 ;;
       -V|--version) print -Pr "${_version}"; exit 0 ;;
       --debug) _verbosity=3; shift ;;
+      --generator)
+        if (( ! ${_valid_generators[(Ie)${2}]} )) {
+          log_error "Invalid value %B${2}%b for option %B${1}%b"
+          log_output ${_usage}
+          exit 2
+        }
+        generator=${2}
+        shift 2
+        ;;
+      --skip-*)
+        local _skip="${${(s:-:)1}[-1]}"
+        local _check=(all deps unpack build)
+        (( ${_check[(Ie)${_skip}]} )) || log_warning "Invalid skip mode %B${_skip}%b supplied"
+        typeset -g -a skips=(${skips} ${_skip})
+        shift
+        ;;
       *) log_error "Unknown option: %B${1}%b"; log_output ${_usage}; exit 2 ;;
     }
   }
@@ -120,68 +160,87 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
   set_loglevel ${_verbosity}
 
   check_${host_os}
+  setup_ccache
+
+  typeset -g QT_VERSION
+  typeset -g DEPLOYMENT_TARGET
+  typeset -g OBS_DEPS_VERSION
   setup_${host_os}
 
+  local product_name
+  local product_version
   read -r product_name product_version <<< \
-    "$(jq -r '. | {name, version} | join(" ")' ${project_root}/buildspec.json)"
+    "$(jq -r '. | {name, version} | join(" ")' ${buildspec_file})"
 
   case ${host_os} {
-    macos-*)
+    macos)
       sed -i '' \
         "s/project(\(.*\) VERSION \(.*\))/project(${product_name} VERSION ${product_version})/" \
-        "${project_root}"/CMakeLists.txt
+        "${project_root}/CMakeLists.txt"
       ;;
-    linux-*)
+    linux)
       sed -i'' \
         "s/project(\(.*\) VERSION \(.*\))/project(${product_name} VERSION ${product_version})/"\
-        "${project_root}"/CMakeLists.txt
+        "${project_root}/CMakeLists.txt"
       ;;
   }
 
-  setup_ccache
   setup_obs
 
   pushd ${project_root}
-  log_info "Configuring ${product_name}..."
+  if (( ! (${skips[(Ie)all]} + ${skips[(Ie)build]}) )) {
+    log_info "Configuring ${product_name}..."
+
+    local _plugin_deps="${project_root:h}/obs-build-dependencies/plugin-deps-${OBS_DEPS_VERSION}-qt${QT_VERSION}-${target##*-}"
+    local -a cmake_args=(
+      -DCMAKE_BUILD_TYPE=${BUILD_CONFIG:-RelWithDebInfo}
+      -DQT_VERSION=${QT_VERSION}
+      -DCMAKE_PREFIX_PATH="${_plugin_deps}"
+    )
+
+    if (( _loglevel == 0 )) cmake_args+=(-Wno_deprecated -Wno-dev --log-level=ERROR)
+    if (( _loglevel > 2 )) cmake_args+=(--debug-output)
+
+    local num_procs
+
+    case ${target} {
+      macos-*)
+        autoload -Uz read_codesign
+        if (( ${+CODESIGN} )) {
+          read_codesign
+        }
 
-  local -a cmake_args=(
-    -DCMAKE_BUILD_TYPE=${BUILD_CONFIG:-RelWithDebInfo}
-    -DCMAKE_PREFIX_PATH="${project_root:h}/obs-build-dependencies/obs-plugin-deps"
-  )
+        cmake_args+=(
+          -DCMAKE_FRAMEWORK_PATH="${_plugin_deps}/Frameworks"
+          -DCMAKE_OSX_ARCHITECTURES=${${target##*-}//universal/x86_64;arm64}
+          -DCMAKE_OSX_DEPLOYMENT_TARGET=${DEPLOYMENT_TARGET:-10.15}
+          -DOBS_CODESIGN_LINKER=ON
+          -DOBS_BUNDLE_CODESIGN_IDENTITY="${CODESIGN_IDENT:--}"
+        )
+        num_procs=$(( $(sysctl -n hw.ncpu) + 1 ))
+        ;;
+      linux-*)
+        if (( ${+CI} )) {
+          cmake_args+=(-DCMAKE_INSTALL_PREFIX=/usr -DLINUX_PORTABLE=OFF)
+        }
+        num_procs=$(( $(nproc) + 1 ))
+        ;;
+    }
 
-  if (( _loglevel == 0 )) cmake_args+=(-Wno_deprecated -Wno-dev --log-level=ERROR)
-
-  case ${target} {
-    macos-*)
-      autoload -Uz read_codesign
-      if (( ${+CODESIGN} )) {
-        read_codesign
-      }
-
-      cmake_args+=(
-        -DCMAKE_OSX_ARCHITECTURES=${${target##*-}//universal/x86_64;arm64}
-        -DCMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:-10.15}
-        -DOBS_BUNDLE_CODESIGN_IDENTITY="${CODESIGN_IDENT:--}"
-        -DCMAKE_FRAMEWORK_PATH="${project_root:h}/obs-build-dependencies/obs-plugin-deps/Frameworks"
-      )
-      ;;
-    linux-*)
-      if (( ${+CI} )) {
-        cmake_args+=(-DCMAKE_INSTALL_PREFIX=/usr)
-      }
-      ;;
-  }
+    log_debug "Attempting to configure ${product_name} with CMake arguments: ${cmake_args}"
+    cmake -S . -B build_${target##*-} -G ${generator} ${cmake_args}
 
-  cmake -S . -B build_${target} -G Ninja ${cmake_args}
+    log_info "Building ${product_name}..."
+    local -a cmake_args=()
+    if (( _loglevel > 1 )) cmake_args+=(--verbose)
+    if [[ ${generator} == 'Unix Makefiles' ]] cmake_args+=(--parallel ${num_procs})
+    cmake --build build_${target##*-} --config ${BUILD_CONFIG:-RelWithDebInfo} ${cmake_args}
+  }
 
+  log_info "Installing ${product_name}..."
   local -a cmake_args=()
   if (( _loglevel > 1 )) cmake_args+=(--verbose)
-
-  log_info "Building ${product_name}"
-  cmake --build build_${target} --config ${BUILD_CONFIG:-RelWithDebInfo} ${cmake_args}
-
-  log_info "Install ${product_name}"
-  cmake --install build_${target} --config ${BUILD_CONFIG:-RelWithDebInfo} --prefix "${project_root}"/release ${cmake_args}
+  cmake --install build_${target##*-} --config ${BUILD_CONFIG:-RelWithDebInfo} --prefix "${project_root}/release" ${cmake_args}
   popd
 }
 
diff --git a/.github/scripts/.package.zsh b/.github/scripts/.package.zsh
index 4e2fee6..e5f2751 100755
--- a/.github/scripts/.package.zsh
+++ b/.github/scripts/.package.zsh
@@ -12,9 +12,9 @@ setopt NO_PUSHD_IGNORE_DUPS
 setopt FUNCTION_ARGZERO
 
 ## Enable for script debugging
-#setopt WARN_CREATE_GLOBAL
-#setopt WARN_NESTED_VAR
-#setopt XTRACE
+# setopt WARN_CREATE_GLOBAL
+# setopt WARN_NESTED_VAR
+# setopt XTRACE
 
 autoload -Uz is-at-least && if ! is-at-least 5.2; then
   print -u2 -PR "%F{1}${funcstack[1]##*/}:%f Running on Zsh version %B${ZSH_VERSION}%b, but Zsh %B5.2%b is the minimum supported version. Upgrade Zsh to fix this issue."
@@ -42,12 +42,13 @@ package() {
   autoload -Uz set_loglevel log_info log_error log_output check_${host_os}
 
   local -i _verbosity=1
-  local -r _version='0.0.1'
+  local -r _version='1.0.0'
   local -r -a _valid_targets=(
     macos-x86_64
     macos-arm64
     macos-universal
     linux-x86_64
+    linux-aarch64
   )
   local -r -a _valid_configs=(Debug RelWithDebInfo Release MinSizeRel)
   local -r _usage="
@@ -66,6 +67,7 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
  -----------------------------------------------------------------------------
   %B-q | --quiet%b                      Quiet (error output only)
   %B-v | --verbose%b                    Verbose (more detailed output)
+  %B--debug%b                           Debug (very detailed and added output)
 
 %F{yellow} General options%f
  -----------------------------------------------------------------------------
@@ -107,8 +109,8 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
         BUILD_CONFIG=${2}
         shift 2
         ;;
-      -s|--codesign) CODESIGN=1; shift ;;
-      -n|--notarize) NOTARIZE=1; shift ;;
+      -s|--codesign) typeset -g CODESIGN=1; shift ;;
+      -n|--notarize) typeset -g NOTARIZE=1; typeset -g CODESIGN=1; shift ;;
       -q|--quiet) (( _verbosity -= 1 )) || true; shift ;;
       -v|--verbose) (( _verbosity += 1 )); shift ;;
       -h|--help) log_output ${_usage}; exit 0 ;;
@@ -123,11 +125,13 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
 
   check_${host_os}
 
+  local product_name
+  local product_version
   read -r product_name product_version <<< \
     "$(jq -r '. | {name, version} | join(" ")' ${project_root}/buildspec.json)"
 
   if [[ ${host_os} == 'macos' ]] {
-    autoload -Uz check_packages check_xcnotary read_codesign read_codesign_installer read_codesign_pass
+    autoload -Uz check_packages read_codesign read_codesign_installer read_codesign_pass
 
     local output_name="${product_name}-${product_version}-${host_os}-${target##*-}.pkg"
 
@@ -136,7 +140,7 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
       return 2
     }
 
-    if [[ ! -f ${project_root}/build_${target}/installer-macos.generated.pkgproj ]] {
+    if [[ ! -f ${project_root}/build_${target##*-}/installer-macos.generated.pkgproj ]] {
       log_error 'Packages project file not found. Run the build script or the CMake build and install procedures first.'
       return 2
     }
@@ -147,7 +151,7 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
     pushd ${project_root}
     packagesbuild \
       --build-folder ${project_root}/release \
-      ${project_root}/build_${target}/installer-macos.generated.pkgproj
+      ${project_root}/build_${target##*-}/installer-macos.generated.pkgproj
 
     if (( ${+CODESIGN} )) {
       read_codesign_installer
@@ -163,25 +167,17 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
     }
 
     if (( ${+CODESIGN} && ${+NOTARIZE} )) {
-      check_xcnotary
-
-      local _error=0
-      if [[ -f "${project_root}/release/${output_name}" ]] {
-        xcnotary precheck "${project_root}/release/${output_name}" || _error=1
-      } else {
+      if [[ ! -f "${project_root}/release/${output_name}" ]] {
         log_error "No package for notarization found."
         return 2
       }
 
-      if (( ! _error )) {
-        read_codesign_installer
-        read_codesign_pass
+      read_codesign_installer
+      read_codesign_pass
 
-        xcnotary notarize "${project_root}/release/${output_name}" \
-          --developer-account "${CODESIGN_IDENT_USER}" \
-          --developer-password-keychain-item "OBS-Codesign-Password" \
-          --provider "${CODESIGN_IDENT_SHORT}"
-      }
+      xcrun notarytool submit "${project_root}/release/${output_name}" \
+        --keychain-profile "OBS-Codesign-Password" --wait
+      xcrun stapler staple "${project_root}/release/${output_name}"
     }
     popd
   } elif [[ ${host_os} == 'linux' ]] {
@@ -189,7 +185,7 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
     if (( _loglevel > 1 )) cmake_args+=(--verbose)
 
     pushd ${project_root}
-    cmake --build build_${target} --config ${BUILD_CONFIG:-RelWithDebInfo} -t package ${cmake_args}
+    cmake --build build_${target##*-} --config ${BUILD_CONFIG:-RelWithDebInfo} -t package ${cmake_args}
     popd
   }
 }
diff --git a/.github/scripts/Build-Windows.ps1 b/.github/scripts/Build-Windows.ps1
index 570155c..5af7c86 100644
--- a/.github/scripts/Build-Windows.ps1
+++ b/.github/scripts/Build-Windows.ps1
@@ -5,7 +5,11 @@ param(
     [ValidateSet('x86', 'x64')]
     [string] $Target,
     [ValidateSet('Visual Studio 17 2022', 'Visual Studio 16 2019')]
-    [string] $CMakeGenerator = 'Visual Studio 16 2019'
+    [string] $CMakeGenerator,
+    [switch] $SkipAll,
+    [switch] $SkipBuild,
+    [switch] $SkipDeps,
+    [switch] $SkipUnpack
 )
 
 $ErrorActionPreference = 'Stop'
@@ -22,7 +26,7 @@ if ( $PSVersionTable.PSVersion -lt '7.0.0' ) {
 
 function Build {
     trap {
-        Pop-Location -Stack BuildTemp
+        Pop-Location -Stack BuildTemp -ErrorAction 'SilentlyContinue'
         Write-Error $_
         exit 2
     }
@@ -42,39 +46,52 @@ function Build {
     $ProductName = $BuildSpec.name
     $ProductVersion = $BuildSpec.version
 
+    $script:DepsVersion = ''
+    $script:QtVersion = '5'
+    $script:VisualStudioVersion = ''
+    $script:PlatformSDK = '10.0.18363.657'
+
     Setup-Host
 
+    if ( $CmakeGenerator -eq '' ) {
+        $CmakeGenerator = $script:VisualStudioVersion
+    }
+
     (Get-Content -Path ${ProjectRoot}/CMakeLists.txt -Raw) `
         -replace "project\((.*) VERSION (.*)\)", "project(${ProductName} VERSION ${ProductVersion})" `
-        | Out-File -Path ${ProjectRoot}/CMakeLists.txt
+        | Out-File -Path ${ProjectRoot}/CMakeLists.txt -NoNewline
 
     Setup-Obs
 
     Push-Location -Stack BuildTemp
-
-    Ensure-Location $ProjectRoot
-
-    $CmakeArgs = @(
-        '-G', $CmakeGenerator
-        '-DCMAKE_SYSTEM_VERSION=10.0.18363.657'
-        "-DCMAKE_GENERATOR_PLATFORM=$(if (${script:Target} -eq "x86") { "Win32" } else { "x64" })"
-        "-DCMAKE_BUILD_TYPE=${Configuration}"
-        "-DCMAKE_PREFIX_PATH=$(Resolve-Path -Path "${ProjectRoot}/../obs-build-dependencies/plugin-deps-${Target}")"
-    )
-
-    Log-Information "Configuring ${ProductName}..."
-    Invoke-External cmake -S . -B build_${script:Target} @CmakeArgs
-
-    $CmakeArgs = @(
-        '--config', "${Configuration}"
-    )
-
-    if ( $VerbosePreference -eq 'Continue' ) {
-        $CmakeArgs+=('--verbose')
+    if ( ! ( ( $SkipAll ) -or ( $SkipBuild ) ) ) {
+        Ensure-Location $ProjectRoot
+
+        $DepsPath = "plugin-deps-${script:DepsVersion}-qt${script:QtVersion}-${script:Target}"
+        $CmakeArgs = @(
+            '-G', $CmakeGenerator
+            "-DCMAKE_SYSTEM_VERSION=${script:PlatformSDK}"
+            "-DCMAKE_GENERATOR_PLATFORM=$(if (${script:Target} -eq "x86") { "Win32" } else { "x64" })"
+            "-DCMAKE_BUILD_TYPE=${Configuration}"
+            "-DCMAKE_PREFIX_PATH:PATH=$(Resolve-Path -Path "${ProjectRoot}/../obs-build-dependencies/${DepsPath}")"
+            "-DQT_VERSION=${script:QtVersion}"
+        )
+
+        Log-Debug "Attempting to configure OBS with CMake arguments: $($CmakeArgs | Out-String)"
+        Log-Information "Configuring ${ProductName}..."
+        Invoke-External cmake -S . -B build_${script:Target} @CmakeArgs
+
+        $CmakeArgs = @(
+            '--config', "${Configuration}"
+        )
+
+        if ( $VerbosePreference -eq 'Continue' ) {
+            $CmakeArgs+=('--verbose')
+        }
+
+        Log-Information "Building ${ProductName}..."
+        Invoke-External cmake --build "build_${script:Target}" @CmakeArgs
     }
-
-    Log-Information "Building ${ProductName}..."
-    Invoke-External cmake --build "build_${script:Target}" @CmakeArgs
     Log-Information "Install ${ProductName}..."
     Invoke-External cmake --install "build_${script:Target}" --prefix "${ProjectRoot}/release" @CmakeArgs
 
diff --git a/.github/scripts/Package-Windows.ps1 b/.github/scripts/Package-Windows.ps1
index 13e292a..a01b10c 100644
--- a/.github/scripts/Package-Windows.ps1
+++ b/.github/scripts/Package-Windows.ps1
@@ -49,8 +49,8 @@ function Package {
     $RemoveArgs = @{
         ErrorAction = 'SilentlyContinue'
         Path = @(
-            "${ProjectRoot}/release/${ProductName}-${ProductVersion}-windows-*.zip"
-            "${ProjectRoot}/release/${ProductName}-${ProductVersion}-windows-*.exe"
+            "${ProjectRoot}/release/${ProductName}-*-windows-*.zip"
+            "${ProjectRoot}/release/${ProductName}-*-windows-*.exe"
         )
     }
 
diff --git a/.github/scripts/check-cmake.sh b/.github/scripts/check-cmake.sh
index 8879ea9..9a69adf 100755
--- a/.github/scripts/check-cmake.sh
+++ b/.github/scripts/check-cmake.sh
@@ -36,7 +36,8 @@ if ! type cmake-format 2> /dev/null ; then
 fi
 
 find . -type d \( \
-    -path ./\*build -o \
+    -path ./\*build\* -o \
+    -path ./release -o \
     -path ./deps/jansson -o \
     -path ./plugins/decklink/\*/decklink-sdk -o \
     -path ./plugins/enc-amf -o \
@@ -44,7 +45,8 @@ find . -type d \( \
     -path ./plugins/obs-outputs/ftl-sdk -o \
     -path ./plugins/obs-vst -o \
     -path ./plugins/obs-browser -o \
-    -path ./plugins/win-dshow/libdshowcapture \
+    -path ./plugins/win-dshow/libdshowcapture -o \
+    -path ./plugins/obs-websocket/deps \
 \) -prune -false -type f -o \
     -name 'CMakeLists.txt' -or \
     -name '*.cmake' \
diff --git a/.github/scripts/check-format.sh b/.github/scripts/check-format.sh
index 3a11383..e829c61 100755
--- a/.github/scripts/check-format.sh
+++ b/.github/scripts/check-format.sh
@@ -26,35 +26,35 @@ elif [[ ${OS} = "Darwin" ]] ; then
 fi
 
 # Discover clang-format
-if type clang-format-12 2> /dev/null ; then
-    CLANG_FORMAT=clang-format-12
+if type clang-format-13 2> /dev/null ; then
+    CLANG_FORMAT=clang-format-13
 elif type clang-format 2> /dev/null ; then
     # Clang format found, but need to check version
     CLANG_FORMAT=clang-format
     V=$(clang-format --version)
-    if [[ $V != *"version 12.0"* ]]; then
-        echo "clang-format is not 12.0 (returned ${V})"
+    if [[ $V != *"version 13.0"* ]]; then
+        echo "clang-format is not 13.0 (returned ${V})"
         exit 1
     fi
 else
-    echo "No appropriate clang-format found (expected clang-format-12.0.0, or clang-format)"
+    echo "No appropriate clang-format found (expected clang-format-13.0.0, or clang-format)"
     exit 1
 fi
 
 find . -type d \( \
     -path ./\*build\* -o \
+    -path ./release -o \
     -path ./cmake -o \
-    -path ./deps -o \
     -path ./plugins/decklink/\*/decklink-sdk -o \
     -path ./plugins/enc-amf -o \
     -path ./plugins/mac-syphon/syphon-framework -o \
     -path ./plugins/obs-outputs/ftl-sdk -o \
-    -path ./plugins/obs-vst \
+    -path ./plugins/obs-websocket/deps \
 \) -prune -false -type f -o \
     -name '*.h' -or \
     -name '*.hpp' -or \
     -name '*.m' -or \
-    -name '*.m,' -or \
+    -name '*.mm' -or \
     -name '*.c' -or \
     -name '*.cpp' \
- | xargs -L100 -P ${NPROC} ${CLANG_FORMAT} ${VERBOSITY} -i -style=file -fallback-style=none
+ | xargs -L100 -P ${NPROC} "${CLANG_FORMAT}" ${VERBOSITY} -i -style=file -fallback-style=none
diff --git a/.github/scripts/utils.pwsh/Expand-ArchiveExt.ps1 b/.github/scripts/utils.pwsh/Expand-ArchiveExt.ps1
index 61bb087..13d6e6f 100644
--- a/.github/scripts/utils.pwsh/Expand-ArchiveExt.ps1
+++ b/.github/scripts/utils.pwsh/Expand-ArchiveExt.ps1
@@ -27,16 +27,16 @@ function Expand-ArchiveExt {
                 if ( Get-Command 7z ) {
                     Invoke-External 7z x -y $Path "-o${DestinationPath}"
                 } else {
-                    throw 'Fallback utility 7-zip not found. Please install 7-zip first.'
+                    throw "Fallback utility 7-zip not found. Please install 7-zip first."
                 }
             }
             break
         }
-        .7z {
+        { ( $_ -eq ".7z" ) -or ( $_ -eq ".exe" ) } {
             if ( Get-Command 7z ) {
                 Invoke-External 7z x -y $Path "-o${DestinationPath}"
             } else {
-                throw 'Extraction utility 7-zip not found. Please install 7-zip first.'
+                throw "Extraction utility 7-zip not found. Please install 7-zip first."
             }
             break
         }
@@ -47,7 +47,7 @@ function Expand-ArchiveExt {
                 if ( Get-Command 7z ) {
                     Invoke-External 7z x -y $Path "-o${DestinationPath}"
                 } else {
-                    throw 'Fallback utility 7-zip not found. Please install 7-zip first.'
+                    throw "Fallback utility 7-zip not found. Please install 7-zip first."
                 }
             }
             break
@@ -59,12 +59,12 @@ function Expand-ArchiveExt {
                 if ( Get-Command 7z ) {
                     Invoke-External 7z x -y $Path "-o${DestinationPath}"
                 } else {
-                    throw 'Fallback utility 7-zip not found. Please install 7-zip first.'
+                    throw "Fallback utility 7-zip not found. Please install 7-zip first."
                 }
             }
         }
         default {
-            throw 'Unsupported archive extension provided.'
+            throw "Unsupported archive extension provided."
         }
     }
 }
diff --git a/.github/scripts/utils.pwsh/Invoke-GitCheckout.ps1 b/.github/scripts/utils.pwsh/Invoke-GitCheckout.ps1
index 754badc..b287a0a 100644
--- a/.github/scripts/utils.pwsh/Invoke-GitCheckout.ps1
+++ b/.github/scripts/utils.pwsh/Invoke-GitCheckout.ps1
@@ -44,7 +44,7 @@ function Invoke-GitCheckout {
     }
 
     if ( ! ( Test-Path function:Log-Information ) ) {
-        . $PSScriptRoot/Utils-Logger.ps1
+        . $PSScriptRoot/Logger.ps1
     }
 
     if ( ! ( Test-Path function:Invoke-External ) ) {
diff --git a/.github/scripts/utils.pwsh/Setup-Host.ps1 b/.github/scripts/utils.pwsh/Setup-Host.ps1
index d5dfca9..c48ad30 100644
--- a/.github/scripts/utils.pwsh/Setup-Host.ps1
+++ b/.github/scripts/utils.pwsh/Setup-Host.ps1
@@ -11,93 +11,86 @@ function Setup-Host {
         . $PSScriptRoot/Install-BuildDependencies.ps1
     }
 
-    Install-BuildDependencies -WingetFile "${ScriptHome}/.Wingetfile"
-
-    if ( $script:Target -eq '' ) { $script:Target = $script:HostArchitecture }
-
-    Push-Location -Stack BuildTemp
-    Log-Information 'Setting up obs-deps...'
-    $DepsVersion = $BuildSpec.dependencies.'obs-deps'."windows-${script:Target}".version
-    $DepsHash = $BuildSpec.dependencies.'obs-deps'."windows-${script:Target}".hash
-
-    if ( ${DepsVersion} -eq '' ) {
-        throw 'No obs-deps version found in buildspec.json.'
-    }
-    Log-Status 'Found obs-deps specification.'
-
-    Ensure-Location -Path "$(Resolve-Path -Path "${ProjectRoot}/..")/obs-build-dependencies"
-
-    if ( ! ( Test-Path -Path "windows-deps-${DepsVersion}-${script:Target}.zip" ) ) {
-        $Params = @{
-            UserAgent = 'NativeHost'
-            Uri = "https://github.com/obsproject/obs-deps/releases/download/win-${DepsVersion}/windows-deps-${DepsVersion}-${script:Target}.zip"
-            OutFile = "windows-deps-${DepsVersion}-${script:Target}.zip"
-            UseBasicParsing = $true
-            ErrorAction = 'Stop'
-        }
-
-        Invoke-WebRequest @Params
-        Log-Status "Downloaded obs-deps for ${script:Target}."
-    } else {
-        Log-Status 'Found downloaded obs-deps.'
-    }
-
-    $FileHash = Get-FileHash -Path "windows-deps-${DepsVersion}-${script:Target}.zip" -Algorithm SHA256
-
-    if ( $FileHash.Hash.ToLower() -ne $DepsHash ) {
-        throw "Checksum mismatch of obs-deps download. Expected '${DepsHash}', found '$(${FileHash}.Hash.ToLower())'"
-    }
-    Log-Status 'Checksum of downloaded obs-deps matches.'
-
-    Ensure-Location -Path "plugin-deps-${Target}"
-
     if ( ! ( Test-Path function:Expand-ArchiveExt ) ) {
         . $PSScriptRoot/Expand-ArchiveExt.ps1
     }
 
-    Log-Information 'Extracting obs-deps...'
-    Expand-ArchiveExt -Path "../windows-deps-${DepsVersion}-${script:Target}.zip" -DestinationPath . -Force
-    Pop-Location -Stack BuildTemp
-
-    Push-Location -Stack BuildTemp
-    Log-Information 'Setting up Qt...'
-    $QtVersion = $BuildSpec.dependencies.'obs-deps-qt'."windows-${script:Target}".version
-    $QtHash = $BuildSpec.dependencies.'obs-deps-qt'."windows-${script:Target}".hash
-
-    if ( ${QtVersion} -eq '' ) {
-        throw 'No Qt version found in buildspec.json.'
-    }
-    Log-Status 'Found Qt specification.'
+    Install-BuildDependencies -WingetFile "${ScriptHome}/.Wingetfile"
 
-    Ensure-Location -Path "$(Resolve-Path -Path "${ProjectRoot}/..")/obs-build-dependencies"
+    if ( $script:Target -eq '' ) { $script:Target = $script:HostArchitecture }
 
-    if ( ! ( Test-Path -Path "windows-deps-qt-${DepsVersion}-${script:Target}.zip" ) ) {
-        $Params = @{
-            UserAgent = 'NativeHost'
-            Uri = "https://cdn-fastly.obsproject.com/downloads/windows-deps-qt-${DepsVersion}-${script:Target}.zip"
-            OutFile = "windows-deps-qt-${DepsVersion}-${script:Target}.zip"
-            UseBasicParsing = $true
-            ErrorAction = 'Stop'
+    $script:QtVersion = $BuildSpec.platformConfig."windows-${script:Target}".qtVersion
+    $script:VisualStudioVersion = $BuildSpec.platformConfig."windows-${script:Target}".visualStudio
+    $script:PlatformSDK = $BuildSpec.platformConfig."windows-${script:Target}".platformSDK
+
+    if ( ! ( ( $script:SkipAll ) -or ( $script:SkipDeps ) ) ) {
+        ('prebuilt', "qt${script:QtVersion}") | ForEach-Object {
+            $_Dependency = $_
+            $_Version = $BuildSpec.dependencies."${_Dependency}".version
+            $_BaseUrl = $BuildSpec.dependencies."${_Dependency}".baseUrl
+            $_Label = $BuildSpec.dependencies."${_Dependency}".label
+            $_Hash = $BuildSpec.dependencies."${_Dependency}".hashes."windows-${script:Target}"
+
+            if ( $BuildSpec.dependencies."${_Dependency}".PSobject.Properties.Name -contains "pdb-hashes" ) {
+                $_PdbHash = $BuildSpec.dependencies."${_Dependency}".'pdb-hashes'."$windows-${script:Target}"
+            }
+
+            if ( $_Version -eq '' ) {
+                throw "No ${_Dependency} spec found in ${script:BuildSpecFile}."
+            }
+
+            Log-Information "Setting up ${_Label}..."
+
+            Push-Location -Stack BuildTemp
+            Ensure-Location -Path "$(Resolve-Path -Path "${ProjectRoot}/..")/obs-build-dependencies"
+
+            switch -wildcard ( $_Dependency ) {
+                prebuilt {
+                    $_Filename = "windows-deps-${_Version}-${script:Target}.zip"
+                    $_Uri = "${_BaseUrl}/${_Version}/${_Filename}"
+                    $_Target = "plugin-deps-${_Version}-qt${script:QtVersion}-${script:Target}"
+                    $script:DepsVersion = ${_Version}
+                }
+                "qt*" {
+                    $_Filename = "windows-deps-qt${script:QtVersion}-${_Version}-${script:Target}.zip"
+                    $_Uri = "${_BaseUrl}/${_Version}/${_Filename}"
+                    $_Target = "plugin-deps-${_Version}-qt${script:QtVersion}-${script:Target}"
+                }
+            }
+
+            if ( ! ( Test-Path -Path $_Filename ) ) {
+                $Params = @{
+                    UserAgent = 'NativeHost'
+                    Uri = $_Uri
+                    OutFile = $_Filename
+                    UseBasicParsing = $true
+                    ErrorAction = 'Stop'
+                }
+
+                Invoke-WebRequest @Params
+                Log-Status "Downloaded ${_Label} for ${script:Target}."
+            } else {
+                Log-Status "Found downloaded ${_Label}."
+            }
+
+            $_FileHash = Get-FileHash -Path $_Filename -Algorithm SHA256
+
+            if ( $_FileHash.Hash.ToLower() -ne $_Hash ) {
+                throw "Checksum of downloaded ${_Label} does not match specification. Expected '${_Hash}', 'found $(${_FileHash}.Hash.ToLower())'"
+            }
+            Log-Status "Checksum of downloaded ${_Label} matches."
+
+            if ( ! ( ( $script:SkipAll ) -or ( $script:SkipUnpack ) ) ) {
+                Push-Location -Stack BuildTemp
+                Ensure-Location -Path $_Target
+
+                Expand-ArchiveExt -Path "../${_Filename}" -DestinationPath . -Force
+
+                Pop-Location -Stack BuildTemp
+            }
+            Pop-Location -Stack BuildTemp
         }
-
-        Invoke-WebRequest @Params
-        Log-Status "Downloaded Qt for ${script:Target}."
-    } else {
-        Log-Status 'Found downloaded Qt.'
-    }
-
-    $FileHash = Get-FileHash -Path "windows-deps-qt-${DepsVersion}-${script:Target}.zip" -Algorithm SHA256
-
-    if ( $FileHash.Hash.ToLower() -ne ${QtHash} ) {
-        throw "Checksum mismatch of Qt download. Expected '${QtHash}', found '$(${FileHash}.Hash.ToLower())'"
     }
-    Log-Status 'Checksum of downloaded Qt matches.'
-
-    Ensure-Location -Path "plugin-deps-${Target}"
-
-    Log-Information 'Extracting Qt...'
-    Expand-ArchiveExt -Path "../windows-deps-qt-${DepsVersion}-${script:Target}.zip" -DestinationPath . -Force
-    Pop-Location -Stack BuildTemp
 }
 
 function Get-HostArchitecture {
diff --git a/.github/scripts/utils.pwsh/Setup-Obs.ps1 b/.github/scripts/utils.pwsh/Setup-Obs.ps1
index 332e223..1d56204 100644
--- a/.github/scripts/utils.pwsh/Setup-Obs.ps1
+++ b/.github/scripts/utils.pwsh/Setup-Obs.ps1
@@ -35,43 +35,50 @@ function Setup-Obs {
     Push-Location -Stack BuildTemp
     Ensure-Location -Path "$(Resolve-Path -Path "${ProjectRoot}/../")/obs-studio"
 
-    Invoke-GitCheckout -Uri $ObsRepository -Commit $ObsHash -Path . -Branch $ObsBranch
-
-    Log-Information 'Configuring OBS Studio...'
-
-    $NumProcessors = (Get-CimInstance Win32_ComputerSystem).NumberOfLogicalProcessors
-
-    if ( $NumProcessors -gt 1 ) {
-        $env:UseMultiToolTask = $true
-        $env:EnforceProcessCountAcrossBuilds = $true
+    if ( ! ( ( $script:SkipAll ) -or ( $script:SkipUnpack ) ) ) {
+        Invoke-GitCheckout -Uri $ObsRepository -Commit $ObsHash -Path . -Branch $ObsBranch
     }
 
-    $CmakeArgs = @(
-        '-G', $script:CmakeGenerator
-        '-DCMAKE_SYSTEM_VERSION=10.0.18363.657'
-        "-DCMAKE_GENERATOR_PLATFORM=$(if (${script:Target} -eq "x86") { "Win32" } else { "x64" })"
-        "-DCMAKE_BUILD_TYPE=${script:Configuration}"
-        '-DENABLE_PLUGINS=OFF'
-        '-DENABLE_UI=OFF'
-        '-DENABLE_SCRIPTING=OFF'
-        "-DCMAKE_INSTALL_PREFIX=$(Resolve-Path -Path "${ProjectRoot}/../obs-build-dependencies/plugin-deps-${Target}")"
-        "-DCMAKE_PREFIX_PATH=$(Resolve-Path -Path "${ProjectRoot}/../obs-build-dependencies/plugin-deps-${Target}")"
-    )
-
-    Invoke-External cmake -S . -B plugin_${script:Target} @CmakeArgs
-
-    Log-Information 'Building libobs and obs-frontend-api...'
-
-    $CmakeArgs = @(
-        '--config', "$( if ( $script:Configuration -eq '' ) { 'RelWithDebInfo' } else { $script:Configuration })"
-    )
-
-    if ( $VerbosePreference -eq 'Continue' ) {
-        $CmakeArgs+=('--verbose')
+    if ( ! ( ( $script:SkipAll ) -or ( $script:SkipBuild ) ) ) {
+        Log-Information 'Configuring OBS Studio...'
+
+        $NumProcessors = (Get-CimInstance Win32_ComputerSystem).NumberOfLogicalProcessors
+
+        if ( $NumProcessors -gt 1 ) {
+            $env:UseMultiToolTask = $true
+            $env:EnforceProcessCountAcrossBuilds = $true
+        }
+
+        $DepsPath = "plugin-deps-${script:DepsVersion}-qt${script:QtVersion}-${script:Target}"
+
+        $CmakeArgs = @(
+            '-G', $CmakeGenerator
+            "-DCMAKE_SYSTEM_VERSION=${script:PlatformSDK}"
+            "-DCMAKE_GENERATOR_PLATFORM=$(if (${script:Target} -eq "x86") { "Win32" } else { "x64" })"
+            "-DCMAKE_BUILD_TYPE=${script:Configuration}"
+            "-DQT_VERSION=${script:QtVersion}"
+            '-DENABLE_PLUGINS=OFF'
+            '-DENABLE_UI=OFF'
+            '-DENABLE_SCRIPTING=OFF'
+            "-DCMAKE_INSTALL_PREFIX:PATH=$(Resolve-Path -Path "${ProjectRoot}/../obs-build-dependencies/${DepsPath}")"
+            "-DCMAKE_PREFIX_PATH:PATH=$(Resolve-Path -Path "${ProjectRoot}/../obs-build-dependencies/${DepsPath}")"
+        )
+
+        Log-Debug "Attempting to configure OBS with CMake arguments: $($CmakeArgs | Out-String)"
+        Log-Information "Configuring OBS..."
+        Invoke-External cmake -S . -B plugin_build_${script:Target} @CmakeArgs
+
+        Log-Information 'Building libobs and obs-frontend-api...'
+        $CmakeArgs = @(
+            '--config', "$( if ( $script:Configuration -eq '' ) { 'RelWithDebInfo' } else { $script:Configuration })"
+        )
+
+        if ( $VerbosePreference -eq 'Continue' ) {
+            $CmakeArgs+=('--verbose')
+        }
+
+        Invoke-External cmake --build plugin_build_${script:Target} @CmakeArgs -t obs-frontend-api
+        Invoke-External cmake --install plugin_build_${script:Target} @CmakeArgs --component obs_libraries
     }
-
-    Invoke-External cmake --build plugin_${script:Target} @CmakeArgs -t obs-frontend-api
-    Invoke-External cmake --install plugin_${script:Target} @CmakeArgs --component obs_libraries
-
     Pop-Location -Stack BuildTemp
 }
diff --git a/.github/scripts/utils.zsh/check_linux b/.github/scripts/utils.zsh/check_linux
index 397db75..b69ba31 100644
--- a/.github/scripts/utils.zsh/check_linux
+++ b/.github/scripts/utils.zsh/check_linux
@@ -1 +1,36 @@
-:
+autoload -Uz log_info log_status log_error log_debug log_warning
+
+log_debug 'Checking for apt-get...'
+if (( ! ${+commands[apt-get]} )) {
+  log_error 'No apt-get command found. Please install apt'
+  return 2
+} else {
+  log_debug "Apt-get located at ${commands[apt-get]}"
+}
+
+local -a dependencies=("${(f)$(<${SCRIPT_HOME}/.Aptfile)}")
+local -a install_list
+local binary
+
+for dependency (${dependencies}) {
+  local -a tokens=(${(s: :)dependency//(,|:|\')/})
+
+  if [[ ! ${tokens[1]} == 'package' ]] continue
+
+  if [[ ${#tokens} -gt 2 && ${tokens[3]} == 'bin' ]] {
+    binary=${tokens[4]}
+  } else {
+    binary=${tokens[2]}
+  }
+
+  if (( ! ${+commands[${binary}]} )) install_list+=(${tokens[2]})
+}
+
+local -a _quiet=('' '--quiet')
+
+log_debug "List of dependencies to install: ${install_list}"
+if (( ${#install_list} )) {
+  if (( ! ${+CI} )) log_warning 'Dependency installation via apt may require elevated privileges'
+
+  sudo apt-get -y install ${install_list} ${_quiet[(( (_loglevel == 0) + 1 ))]}
+}
diff --git a/.github/scripts/utils.zsh/check_macos b/.github/scripts/utils.zsh/check_macos
index 0f828bd..03eb3ec 100644
--- a/.github/scripts/utils.zsh/check_macos
+++ b/.github/scripts/utils.zsh/check_macos
@@ -3,8 +3,8 @@ autoload -Uz is-at-least log_info log_error log_status read_codesign
 local macos_version=$(sw_vers -productVersion)
 
 log_info 'Checking macOS version...'
-if ! is-at-least 10.15.0 "${macos_version}"; then
-  log_error "Minimum required macOS version is 10.15, but running on macOS ${macos_version}"
+if ! is-at-least 11.0 "${macos_version}"; then
+  log_error "Minimum required macOS version is 11.0, but running on macOS ${macos_version}"
   return 2
 else
   log_status "macOS ${macos_version} is recent"
@@ -16,5 +16,5 @@ if (( ! ${+commands[brew]} )) {
   return 2
 }
 
-brew bundle --file "${SCRIPT_HOME}/.Brewfile" --no-upgrade
+brew bundle --file "${SCRIPT_HOME}/.Brewfile"
 rehash
diff --git a/.github/scripts/utils.zsh/check_packages b/.github/scripts/utils.zsh/check_packages
index 8f521ff..31f2d0f 100644
--- a/.github/scripts/utils.zsh/check_packages
+++ b/.github/scripts/utils.zsh/check_packages
@@ -32,6 +32,7 @@ if (( ! ${+commands[packagesbuild]} )) {
     curl ${curl_opts} ${packages_url}
   }
 
+  local image_checksum
   read -r image_checksum _ <<< "$(sha256sum Packages.dmg)"
 
   if [[ ${packages_hash} != ${image_checksum} ]] {
diff --git a/.github/scripts/utils.zsh/check_xcnotary b/.github/scripts/utils.zsh/check_xcnotary
deleted file mode 100644
index 597357f..0000000
--- a/.github/scripts/utils.zsh/check_xcnotary
+++ /dev/null
@@ -1,9 +0,0 @@
-autoload -Uz log_info log_error
-
-log_info 'Checking for Homebrew...'
-if (( ! ${+commands[brew]} )) {
-  log_error 'No Homebrew command found. Please install Homebrew (https://brew.sh)'
-  return 2
-}
-
-if (( ! ${+commands[xcnotary]} )) brew install akeru-inc/tap/xcnotary
diff --git a/.github/scripts/utils.zsh/read_codesign_pass b/.github/scripts/utils.zsh/read_codesign_pass
index 5dc3ef9..8f7683d 100644
--- a/.github/scripts/utils.zsh/read_codesign_pass
+++ b/.github/scripts/utils.zsh/read_codesign_pass
@@ -17,6 +17,8 @@ if (( ! ${+CODESIGN_IDENT} )) {
   read_codesign
 }
 
+local codesign_ident_short=$(print "${CODESIGN_IDENT}" | /usr/bin/sed -En 's/.+\((.+)\)/\1/p')
+
 if (( ! ${+CODESIGN_IDENT_USER} )) {
   read_codesign_user
 }
@@ -26,6 +28,6 @@ if (( ! ${+CODESIGN_IDENT_PASS} )) {
   read -s CODESIGN_IDENT_PASS'?Apple Developer ID password: '
 }
 
+print ''
 log_info 'Setting up notarization keychain...'
-xcrun altool --store-password-in-keychain-item 'OBS-Codesign-Password' -u "${CODESIGN_IDENT_USER}" -p "${CODESIGN_IDENT_PASS}"
-typeset -g CODESIGN_IDENT_SHORT=$(print "${CODESIGN_IDENT}" | /usr/bin/sed -En 's/.+\((.+)\)/\1/p')
+xcrun notarytool store-credentials 'OBS-Codesign-Password' --apple-id "${CODESIGN_IDENT_USER}" --team-id "${codesign_ident_short}" --password "${CODESIGN_IDENT_PASS}"
diff --git a/.github/scripts/utils.zsh/setup_linux b/.github/scripts/utils.zsh/setup_linux
index 0956305..d0a0164 100644
--- a/.github/scripts/utils.zsh/setup_linux
+++ b/.github/scripts/utils.zsh/setup_linux
@@ -1,45 +1,62 @@
 autoload -Uz log_error log_status log_info mkcd
 
-if (( ! ${+commands[apt-get]} )) {
-  log_error 'apt-get not found. Please ensure apt is available on the system.'
+if (( ! ${+project_root} )) {
+  log_error "'project_root' not set. Please set before running ${0}."
   return 2
 }
 
-log_info 'Installing obs build dependencies...'
-sudo dpkg --add-architecture amd64
-sudo apt-get -qq update
-sudo apt-get install -y \
+if (( ! ${+target} )) {
+  log_error "'target' not set. Please set before running ${0}."
+  return 2
+}
+
+pushd ${project_root}
+
+typeset -g QT_VERSION
+read -r QT_VERSION <<< \
+  "$(jq -r --arg target "${target}" \
+    '.platformConfig[$target] | { qtVersion } | join(" ")' \
+    ${project_root}/buildspec.json)"
+
+if (( ! (${skips[(Ie)all]} + ${skips[(Ie)deps]}) )) {
+  log_info 'Installing obs build dependencies...'
+
+  sudo apt-get install -y \
     build-essential \
-    ninja-build \
-    ccache \
-    clang \
-    clang-format \
-    git \
-    jq \
-    qtbase5-dev \
-    libqt5svg5-dev \
-    libqt5x11extras5-dev \
-    qtbase5-private-dev \
-    libwayland-dev \
-    libavcodec-dev \
-    libavdevice-dev \
-    libavfilter-dev \
-    libavformat-dev \
-    libavutil-dev \
-    libswresample-dev \
-    libswscale-dev \
-    libx264-dev \
+    libcurl4-openssl-dev \
+    libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev \
+    libswresample-dev libswscale-dev \
     libjansson-dev \
-    libpulse-dev \
-    libx11-dev \
     libx11-xcb-dev \
-    libmbedtls-dev \
-    libgl1-mesa-dev \
-    pkg-config \
-    libcurl4-openssl-dev
+    libgles2-mesa-dev \
+    libwayland-dev \
+    libpulse-dev
+
+  local -a _qt_packages=()
+
+  if (( QT_VERSION == 5 )) {
+    _qt_packages+=(
+      qtbase5-dev
+      libqt5svg5-dev
+      qtbase5-private-dev
+      libqt5x11extras5-dev
+    )
+  } elif (( QT_VERSION == 6 )) {
+    _qt_packages+=(
+      qt6-base-dev
+      libqt6svg6-dev
+      qt6-base-private-dev
+    )
+  } else {
+    log_error "Unsupported Qt version '${QT_VERSION}' specified."
+    return 2
+  }
+
+  sudo apt-get install -y ${_qt_packages}
+}
 
-if ! type cmake &>/dev/null; then
-    sudo apt-get install -y cmake
-fi
+local deps_version
+read -r deps_version <<< \
+  "$(jq -r '.dependencies.prebuilt.version' ${buildspec_file})"
 
-rehash
+typeset -g OBS_DEPS_VERSION=${deps_version}
diff --git a/.github/scripts/utils.zsh/setup_macos b/.github/scripts/utils.zsh/setup_macos
index b570ccd..7b14e9d 100644
--- a/.github/scripts/utils.zsh/setup_macos
+++ b/.github/scripts/utils.zsh/setup_macos
@@ -29,76 +29,99 @@ if (( ! ${+CI} )) {
 curl_opts+=(--location -O ${@})
 
 pushd ${project_root}
-log_info 'Setting up obs-deps...'
-read -r deps_version deps_hash <<< \
-  "$(jq -r --arg key "obs-deps" --arg target "${target}" \
-    '.dependencies[$key][$target] | {version, hash} | join(" ")' \
-    ${buildspec_file})"
-
-if [[ -z "${deps_version}" ]] {
-  log_error 'No obs-deps version found in buildspec.json.'
-  return 2
-}
-log_status 'Found obs-deps specification.'
-
-mkcd ${project_root:h}/obs-build-dependencies
-
-if [[ ! -f macos-deps-${deps_version}-${target##*-}.tar.xz ]] {
-  curl ${curl_opts} \
-    "https://github.com/obsproject/obs-deps/releases/download/${deps_version}/macos-deps-${deps_version}-${target##*-}.tar.xz" && \
-    log_status "Downloaded obs-deps for ${target}."
-} else {
-  log_status 'Found downloaded obs-deps.'
-}
-
-read -r artifact_checksum _ <<< "$(sha256sum macos-deps-${deps_version}-${target##*-}.tar.xz)"
-if [[ ${deps_hash} != ${artifact_checksum} ]] {
-  log_error "Checksum of downloaded obs-deps does not match specification.
-Expected : ${deps_hash}
-Actual   : ${artifact_checksum}"
-  return 2
-}
-log_status 'Checksum of downloaded obs-deps matches.'
 
-mkcd obs-plugin-deps
-XZ_OPT=-T0 tar -xzf ../macos-deps-${deps_version}-${target##*-}.tar.xz && log_status 'obs-deps extracted.'
-popd
-
-pushd ${project_root}
-log_info 'Setting up Qt...'
-read -r qt_version qt_hash <<< \
-  "$(jq -r --arg key "obs-deps-qt" --arg target "${target}" \
-    '.dependencies[$key][$target] | {version, hash} | join(" ")' \
+local _qt_version
+local _deployment_target
+read -r _qt_version _deployment_target <<< \
+  "$(jq -r --arg target "${target}" \
+    '.platformConfig[$target] | { qtVersion, deploymentTarget } | join (" ")' \
     ${buildspec_file})"
 
-if [[ -z "${qt_version}" ]] {
-  log_error 'No obs-deps version found in buildspec.json.'
-  return 2
-}
-log_status 'Found Qt specification.'
-
-mkcd ${project_root:h}/obs-build-dependencies
-
-if [[ ! -f macos-deps-qt-${deps_version}-${target##*-}.tar.xz ]] {
-  curl ${curl_opts} \
-    "https://github.com/obsproject/obs-deps/releases/download/${deps_version}/macos-deps-qt-${deps_version}-${target##*-}.tar.xz" && \
-    log_status "Downloaded Qt for ${target}"
+typeset -g QT_VERSION=${_qt_version}
+typeset -g DEPLOYMENT_TARGET=${_deployment_target}
+
+if (( ! (${skips[(Ie)all]}  + ${skips[(Ie)deps]}) )) {
+  mkdir -p ${project_root:h}/obs-build-dependencies
+
+  local dependency
+  local deps_version
+  local deps_baseurl
+  local deps_label
+  local deps_hash
+  local _filename
+  local _url
+  local _target
+  local artifact_checksum
+
+  for dependency ('prebuilt' "qt${QT_VERSION}") {
+    IFS=';' read -r deps_version deps_baseurl deps_label deps_hash <<< \
+      "$(jq -r --arg dependency "${dependency}" --arg target "${target}" \
+        '.dependencies[$dependency] | {version, baseUrl, "label", "hash": .hashes[$target]} | join(";")' \
+        ${buildspec_file})"
+
+    if [[ -z "${deps_version}" ]] {
+      log_error "No ${dependency} spec found in ${buildspec_file}."
+      return 2
+    }
+    log_info "Setting up ${deps_label}..."
+
+    pushd ${project_root:h}/obs-build-dependencies
+
+    case ${dependency} {
+      prebuilt)
+        _filename="macos-deps-${deps_version}-${target##*-}.tar.xz"
+        _url="${deps_baseurl}/${deps_version}/${_filename}"
+        _target="plugin-deps-${deps_version}-qt${QT_VERSION}-${target##*-}"
+        typeset -g OBS_DEPS_VERSION=${deps_version}
+        ;;
+      qt*)
+        if (( ${+CI} )) {
+          _filename="macos-deps-qt${QT_VERSION}-${deps_version}-universal.tar.xz"
+          deps_hash="$(jq -r --arg dependency "${dependency}" \
+            '.dependencies[$dependency].hashes["macos-universal"]' \
+            ${buildspec_file})"
+        } else {
+          _filename="macos-deps-qt${QT_VERSION}-${deps_version}-${target##*-}.tar.xz"
+        }
+        _url="${deps_baseurl}/${deps_version}/${_filename}"
+        _target="plugin-deps-${deps_version}-qt${QT_VERSION}-${target##*-}"
+        ;;
+    }
+
+    if [[ ! -f ${_filename} ]] {
+      log_debug "Running curl ${curl_opts} ${_url}"
+      curl ${curl_opts} ${_url} && \
+      log_status "Downloaded ${deps_label} for ${target}."
+    } else {
+      log_status "Found downloaded ${deps_label}"
+    }
+
+    read -r artifact_checksum _ <<< "$(sha256sum ${_filename})"
+    if [[ ${deps_hash} != ${artifact_checksum} ]] {
+      log_error "Checksum of downloaded ${deps_label} does not match specification.
+  Expected : ${deps_hash}
+  Actual   : ${artifact_checksum}"
+      return 2
+    }
+    log_status "Checksum of downloaded ${deps_label} matches."
+
+    if (( ! (${skips[(Ie)all]} + ${skips[(Ie)unpack]}) )) {
+      mkdir -p ${_target} && pushd ${_target}
+
+      XZ_OPT=-T0 tar -xzf ../${_filename} && log_status "${deps_label} extracted."
+      popd
+    }
+  }
+
+  popd
+  pushd ${project_root:h}/obs-build-dependencies
+  xattr -r -d com.apple.quarantine *
+  log_status 'Removed quarantine flag from downloaded dependencies...'
+  popd
 } else {
-  log_status 'Found downloaded Qt.'
-}
+  local deps_version
+  read -r deps_version <<< \
+    "$(jq -r '.dependencies.prebuilt.version' ${buildspec_file})"
 
-read -r artifact_checksum _ <<< "$(sha256sum macos-deps-qt-${deps_version}-${target##*-}.tar.xz)"
-if [[ ${qt_hash} != ${artifact_checksum} ]] {
-  log_error "Checksum of downloaded Qt does not match specification.
-Expected : ${qt_hash}
-Actual   : ${artifact_checksum}"
-  return 2
+  typeset -g OBS_DEPS_VERSION=${deps_version}
 }
-log_status 'Checksum of downloaded Qt matches.'
-
-mkcd obs-plugin-deps
-XZ_OPT=-T0 tar -xzf ../macos-deps-qt-${qt_version}-${target##*-}.tar.xz && log_status 'Qt extracted.'
-
-xattr -r -d com.apple.quarantine *
-log_status 'Removed quarantine flag from downloaded dependencies...'
-popd
diff --git a/.github/scripts/utils.zsh/setup_obs b/.github/scripts/utils.zsh/setup_obs
index 0dfa704..170e8ee 100644
--- a/.github/scripts/utils.zsh/setup_obs
+++ b/.github/scripts/utils.zsh/setup_obs
@@ -25,15 +25,13 @@ if (( ! ${+target} )) {
   return 2
 }
 
-if [[ ! -r ${buildspec_file} ]] {
-  log_error \
-    'No buildspec.json found. Please create a build specification for your project.' \
-    'A buildspec.json.template file is provided in the repository to get you started.'
-  return 2
-}
-
 log_info 'Setting up OBS-Studio...'
 
+local obs_version
+local obs_repo
+local obs_branch
+local obs_hash
+
 read -r obs_version obs_repo obs_branch obs_hash <<< \
   "$(jq -r --arg key "obs-studio" \
      '.dependencies[$key] | {version, repository, branch, hash} | join(" ")' \
@@ -47,59 +45,78 @@ if [[ -z ${obs_version} ]] {
 pushd
 mkcd ${project_root:h}/obs-studio
 
-if [[ -d .git ]] {
-  git config advice.detachedHead false
-  git config remote.pluginbuild.url "${obs_repo:-https://github.com/obsproject/obs-studio.git}"
-  git config remote.pluginbuild.fetch "+refs/heads/${obs_branch:-master}:refs/remotes/origin/${obs_branch:-master}"
-
-  git rev-parse -q --verify "${obs_hash}^{commit}" > /dev/null || git fetch pluginbuild
-  git checkout ${obs_branch:-master} -B ${product_name}
-  git reset --hard "${obs_hash}"
-  log_status 'Found existing obs-studio repository.'
-} else {
-  git clone "${obs_repo:-https://github.com/obsproject/obs-studio.git}" "${PWD}"
-  git config advice.detachedHead false
-  git checkout -f "${obs_hash}" --
-  git checkout ${obs_branch:-master} -b ${product_name}
-  log_status 'obs-studio checked out.'
+if (( ! (${skips[(Ie)all]} + ${skips[(Ie)unpack]}) )) {
+  if [[ -d .git ]] {
+    git config advice.detachedHead false
+    git config remote.pluginbuild.url "${obs_repo:-https://github.com/obsproject/obs-studio.git}"
+    git config remote.pluginbuild.fetch "+refs/heads/${obs_branch:-master}:refs/remotes/origin/${obs_branch:-master}"
+
+    git rev-parse -q --verify "${obs_hash}^{commit}" > /dev/null || git fetch pluginbuild
+    git checkout ${obs_branch:-master} -B ${product_name}
+    git reset --hard "${obs_hash}"
+    log_status 'Found existing obs-studio repository.'
+  } else {
+    git clone "${obs_repo:-https://github.com/obsproject/obs-studio.git}" "${PWD}"
+    git config advice.detachedHead false
+    git checkout -f "${obs_hash}" --
+    git checkout ${obs_branch:-master} -b ${product_name}
+    log_status 'obs-studio checked out.'
+  }
+
+  git submodule foreach --recursive git submodule sync
+  git submodule update --init --recursive
 }
 
-git submodule foreach --recursive git submodule sync
-git submodule update --init --recursive
-
-log_info 'Configuring obs-studio...'
-
-local -a cmake_args=(
-  -DCMAKE_BUILD_TYPE=${BUILD_CONFIG:-Release}
-  -DENABLE_PLUGINS=OFF
-  -DENABLE_UI=OFF
-  -DENABLE_SCRIPTING=OFF
-  -DCMAKE_INSTALL_PREFIX="${project_root:h}/obs-build-dependencies/obs-plugin-deps"
-  -DCMAKE_PREFIX_PATH="${project_root:h}/obs-build-dependencies/obs-plugin-deps"
-)
-
-if (( _loglevel == 0 )) cmake_args+=(-Wno_deprecated -Wno-dev --log-level=ERROR)
-
-case ${target} {
-  macos-*)
-    cmake_args+=(
-      -DCMAKE_OSX_ARCHITECTURES=${${target##*-}//universal/x86_64;arm64}
-      -DCMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:-10.15}
-    )
-    ;;
-  linux-*)
-    cmake_args+=(
-      -DENABLE_PIPEWIRE=OFF
-    )
-    ;;
+if (( ! (${skips[(Ie)all]} + ${skips[(Ie)build]}) )) {
+  log_info 'Configuring obs-studio...'
+
+  local -a cmake_args=(
+    -DCMAKE_BUILD_TYPE=${BUILD_CONFIG:-Release}
+    -DQT_VERSION=${QT_VERSION}
+    -DENABLE_PLUGINS=OFF
+    -DENABLE_UI=OFF
+    -DENABLE_SCRIPTING=OFF
+    -DCMAKE_INSTALL_PREFIX="${project_root:h}/obs-build-dependencies/plugin-deps-${OBS_DEPS_VERSION}-qt${QT_VERSION}-${target##*-}"
+    -DCMAKE_PREFIX_PATH="${project_root:h}/obs-build-dependencies/plugin-deps-${OBS_DEPS_VERSION}-qt${QT_VERSION}-${target##*-}"
+  )
+
+  if (( _loglevel == 0 )) cmake_args+=(-Wno_deprecated -Wno-dev --log-level=ERROR)
+  if (( _loglevel > 2 )) cmake_args+=(--debug-output)
+
+  local num_procs
+
+  case ${target} {
+    macos-*)
+      autoload -Uz read_codesign
+      if (( ${+CODESIGN} )) {
+        read_codesign
+      }
+
+      cmake_args+=(
+        -DCMAKE_OSX_ARCHITECTURES=${${target##*-}//universal/x86_64;arm64}
+        -DCMAKE_OSX_DEPLOYMENT_TARGET=${DEPLOYMENT_TARGET:-10.15}
+        -DOBS_CODESIGN_LINKER=ON
+        -DOBS_BUNDLE_CODESIGN_IDENTITY="${CODESIGN_IDENT:--}"
+      )
+      num_procs=$(( $(sysctl -n hw.ncpu) + 1 ))
+      ;;
+    linux-*)
+      cmake_args+=(
+        -DENABLE_PIPEWIRE=OFF
+      )
+      num_procs=$(( $(nproc) + 1 ))
+      ;;
+  }
+
+  log_debug "Attempting to configure OBS with CMake arguments: ${cmake_args}"
+  cmake -S . -B plugin_build_${target##*-} -G ${generator} ${cmake_args}
+
+  log_info 'Building libobs and obs-frontend-api...'
+  local -a cmake_args=()
+  if (( _loglevel > 1 )) cmake_args+=(--verbose)
+  if [[ ${generator} == 'Unix Makefiles' ]] cmake_args+=(--parallel ${num_procs})
+  cmake --build plugin_build_${target##*-} --config ${BUILD_CONFIG:-Release} ${cmake_args} -t obs-frontend-api
+  cmake --install plugin_build_${target##*-} --config ${BUILD_CONFIG:-Release} --component obs_libraries ${cmake_args}
 }
 
-cmake -S . -B plugin_build_${target##*-} -G Ninja ${cmake_args}
-
-log_info 'Building libobs and obs-frontend-api...'
-local -a cmake_args=()
-if (( _loglevel > 1 )) cmake_args+=(--verbose)
-
-cmake --build plugin_build_${target##*-} --config ${BUILD_CONFIG:-Release} ${cmake_args} -t obs-frontend-api
-cmake --install plugin_build_${target##*-} --config ${BUILD_CONFIG:-Release} --component obs_libraries ${cmake_args}
 popd
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 258d1ad..be13dd4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,7 +22,7 @@ env:
 jobs:
   clang_check:
     name: 01 - Code Format Check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -30,7 +30,7 @@ jobs:
           submodules: recursive
 
       - name: Install clang-format
-        run: sudo apt-get install -y clang-format-12
+        run: sudo apt-get install -y clang-format-13
 
       - name: Run clang-format
         run: ./.github/scripts/check-format.sh && ./.github/scripts/check-changes.sh
@@ -47,7 +47,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        arch: [x86_64]
+        arch: [x86_64, arm64, universal]
     if: always()
     needs: [clang_check]
     outputs:
@@ -93,25 +93,25 @@ jobs:
           if [[ '${{ secrets.MACOS_SIGNING_APPLICATION_IDENTITY }}' != '' && \
                 '${{ secrets.MACOS_SIGNING_INSTALLER_IDENTITY }}' != '' && \
                 '${{ secrets.MACOS_SIGNING_CERT }}' != '' ]] {
-            print '::set-output name=haveCodesignIdent::true'
+            print 'haveCodesignIdent=true' >> $GITHUB_OUTPUT
           } else {
-            print '::set-output name=haveCodesignIdent::false'
+            print 'haveCodesignIdent=false' >> $GITHUB_OUTPUT
           }
 
           if [[ '${{ secrets.MACOS_NOTARIZATION_USERNAME }}' != '' && \
                 '${{ secrets.MACOS_NOTARIZATION_PASSWORD }}' != '' ]] {
-            print '::set-output name=haveNotarizationUser::true'
+            print 'haveNotarizationUser=true' >> $GITHUB_OUTPUT
           } else {
-            print '::set-output name=haveNotarizationUser::false'
+            print 'haveNotarizationUser=false' >> $GITHUB_OUTPUT
           }
           print '::endgroup::'
 
-          print "::set-output name=ccacheDate::$(date +"%Y-%m-%d")"
-          print "::set-output name=commitHash::${"$(git rev-parse HEAD)"[0,9]}"
+          print "ccacheDate=$(date +"%Y-%m-%d")" >> $GITHUB_OUTPUT
+          print "commitHash=${"$(git rev-parse HEAD)"[0,9]}" >> $GITHUB_OUTPUT
 
       - name: Restore Compilation Cache
         id: ccache-cache
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3
         with:
           path: ${{ github.workspace }}/.ccache
           key: macos-${{ matrix.arch }}-ccache-plugin-${{ steps.setup.outputs.ccacheDate }}
@@ -123,9 +123,9 @@ jobs:
         if: ${{ github.event_name == 'pull_request' }}
         run: |
           if [[ -n "$(curl -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" -s "${{ github.event.pull_request.url }}" | jq -e '.labels[] | select(.name == "Seeking Testers")')" ]] {
-            print '::set-output name=found::true'
+            print 'found=true' >> $GITHUB_OUTPUT
           } else {
-            print '::set-output name=found::false'
+            print 'found=false' >> $GITHUB_OUTPUT
           }
 
       - name: Install Apple Developer Certificate
@@ -173,7 +173,7 @@ jobs:
 
   linux_build:
     name: 02 - Linux
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: true
       matrix:
@@ -205,12 +205,12 @@ jobs:
         id: setup
         run: |
           ## SETUP ENVIRONMENT SCRIPT
-          echo "::set-output name=ccacheDate::$(date +"%Y-%m-%d")"
-          echo "::set-output name=commitHash::$(git rev-parse HEAD | cut -c1-9)"
+          echo "ccacheDate=$(date +"%Y-%m-%d")" >> $GITHUB_OUTPUT
+          echo "commitHash=$(git rev-parse HEAD | cut -c1-9)" >> $GITHUB_OUTPUT
 
       - name: Restore Compilation Cache
         id: ccache-cache
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3
         with:
           path: ${{ github.workspace }}/.ccache
           key: linux-${{ matrix.arch }}-ccache-plugin-${{ steps.setup.outputs.ccacheDate }}
@@ -223,9 +223,9 @@ jobs:
         run: |
           ## GITHUB LABEL SCRIPT
           if [[ -n "$(curl -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" -s "${{ github.event.pull_request.url }}" | jq -e '.labels[] | select(.name == "Seeking Testers")')" ]]; then
-            echo '::set-output name=found::true'
+            echo 'found=true' >> $GITHUB_OUTPUT
           else
-            echo '::set-output name=found::false'
+            echo 'found=false' >> $GITHUB_OUTPUT
           fi
 
       - name: Build Plugin
@@ -255,7 +255,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        arch: [x86, x64]
+        arch: [x64]
     if: always()
     needs: [clang_check]
     outputs:
@@ -284,7 +284,7 @@ jobs:
         run: |
           ## SETUP ENVIRONMENT SCRIPT
           $CommitHash = (git rev-parse HEAD)[0..8] -join ''
-          Write-Output "::set-output name=commitHash::${CommitHash}"
+          "commitHash=${CommitHash}" >> $env:GITHUB_OUTPUT
 
       - name: Check for GitHub Labels
         id: seekingTesters
@@ -305,7 +305,7 @@ jobs:
             $false
           }
 
-          Write-Output "::set-output name=found::$(([string]${LabelFound}).ToLower())"
+          "found=$(([string]${LabelFound}).ToLower())" >> $env:GITHUB_OUTPUT
 
       - name: Build Plugin
         uses: ./plugin/.github/actions/build-plugin
@@ -345,10 +345,9 @@ jobs:
           name: ${{ env.PLUGIN_NAME }}-windows-${{ matrix.arch }}-${{ steps.setup.outputs.commitHash }}-installer
           path: ${{ github.workspace }}/plugin/release/${{ env.PLUGIN_NAME }}-*.exe
 
-
   make-release:
     name: 03 - Create and upload release
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
     needs: [macos_build, linux_build, windows_build]
     defaults:
@@ -359,9 +358,7 @@ jobs:
         id: metadata
         run: |
           ## METADATA SCRIPT
-          echo "::set-output name=version::${GITHUB_REF/refs\/tags\//}"
-          echo "::set-output name=date::$(date +"%Y-%m-%d")"
-          echo '::set-output name=commitHash::${{ needs.macos_build.outputs.commitHash }}'
+          echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
 
       - name: Download build artifacts
         uses: actions/download-artifact@v3
@@ -380,16 +377,12 @@ jobs:
         uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5
         with:
           draft: false
-          prerelease: false
+          prerelease: ${{ contains(steps.metadata.outputs.version, 'rc') || contains(steps.metadata.outputs.version, 'beta') }}
           tag_name: ${{ steps.metadata.outputs.version }}
-          name: "${{ env.PLUGIN_NAME }} Build ${{ steps.metadata.outputs.version }}"
+          name: "${{ env.PLUGIN_NAME }} ${{ steps.metadata.outputs.version }}"
           body_path: ${{ github.workspace }}/CHECKSUMS.txt
           files: |
-            ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-windows-x64-${{ steps.metadata.outputs.commitHash }}/*.zip
-            ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-windows-x64-${{ steps.metadata.outputs.commitHash }}-installer/*.exe
-            ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-windows-x86-${{ steps.metadata.outputs.commitHash }}/*.zip
-            ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-windows-x86-${{ steps.metadata.outputs.commitHash }}-installer/*.exe
-            ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-linux-x86_64-${{ steps.metadata.outputs.commitHash }}/*.deb
-            ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-macos-x86_64-${{ steps.metadata.outputs.commitHash }}/*.pkg
-            ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-macos-arm64-${{ steps.metadata.outputs.commitHash }}/*.pkg
-            ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-macos-universal-${{ steps.metadata.outputs.commitHash }}/*.pkg
+            ${{ github.workspace }}/**/*.zip
+            ${{ github.workspace }}/**/*.exe
+            ${{ github.workspace }}/**/*.deb
+            ${{ github.workspace }}/**/*.pkg
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ea2a4d..e305f75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,24 +1,25 @@
 cmake_minimum_required(VERSION 3.16...3.21)
 
-# Change obs-plugintemplate to your plugin's name in a machine-readable format
-# (e.g.: obs-myawesomeplugin) and set
+# Change obs-plugintemplate to your plugin's name in a machine-readable format (e.g.:
+# obs-myawesomeplugin) and set
 project(obs-lottie VERSION 1.0.0)
 add_library(${CMAKE_PROJECT_NAME} MODULE)
 
-# Replace `Your Name Here` with the name (yours or your organization's) you want
-# to see as the author of the plugin (in the plugin's metadata itself and in the
-# installers)
+# Replace `Your Name Here` with the name (yours or your organization's) you want to see as the
+# author of the plugin (in the plugin's metadata itself and in the installers)
 set(PLUGIN_AUTHOR "Tomasz Żyźniewski")
 
-# Replace `com.example.obs-plugin-template` with a unique Bundle ID for macOS
-# releases (used both in the installer and when submitting the installer for
-# notarization)
+# Replace `com.example.obs-plugin-template` with a unique Bundle ID for macOS releases (used both in
+# the installer and when submitting the installer for notarization)
 set(MACOS_BUNDLEID "online.grandmasters.${CMAKE_PROJECT_NAME}")
 
-# Replace `me@contoso.com` with the maintainer email address you want to put in
-# Linux packages
+# Replace `me@contoso.com` with the maintainer email address you want to put in Linux packages
 set(LINUX_MAINTAINER_EMAIL "tomasz.zyzniewski@grandmasters.online")
 
+# Add your custom source files here - header files are optional and only required for visibility
+# e.g. in Xcode or Visual Studio
+target_sources(${CMAKE_PROJECT_NAME} PRIVATE src/obs-lottie.cpp)
+
 include(FetchContent)
 
 FetchContent_Declare(
@@ -33,33 +34,39 @@ if(NOT rlottie_POPULATED)
   add_subdirectory(${rlottie_SOURCE_DIR} ${rlottie_BINARY_DIR} EXCLUDE_FROM_ALL)
 endif()
 
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-# Add your custom source files here - header files are optional and only
-# required for visibility e.g. in Xcode or Visual Studio
-target_sources(${CMAKE_PROJECT_NAME} PRIVATE src/obs-lottie.cpp)
-
-# /!\ TAKE NOTE: No need to edit things past this point /!\
-
+# Import libobs as main plugin dependency
 find_package(libobs REQUIRED)
 find_package(rlottie REQUIRED)
 include(cmake/ObsPluginHelpers.cmake)
 
-configure_file(src/plugin-macros.h.in
-               ${CMAKE_SOURCE_DIR}/src/plugin-macros.generated.h)
+# Uncomment these lines if you want to use the OBS Frontend API in your plugin
+#[[
+find_package(obs-frontend-api REQUIRED)
+target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE OBS::obs-frontend-api)
+#]]
+
+# Uncomment those lines if you want to use Qt in your plugin
+#[[
+find_qt(COMPONENTS Widgets Core)
+target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Qt::Core Qt::Widgets)
+set_target_properties(
+  ${CMAKE_PROJECT_NAME}
+  PROPERTIES AUTOMOC ON
+             AUTOUIC ON
+             AUTORCC ON)
+#]]
+
+configure_file(src/plugin-macros.h.in ${CMAKE_SOURCE_DIR}/src/plugin-macros.generated.h)
 
 target_sources(${CMAKE_PROJECT_NAME} PRIVATE src/plugin-macros.generated.h)
 
-# --- Platform-independent build settings ---
+# /!\ TAKE NOTE: No need to edit things past this point /!\
 
-target_include_directories(${CMAKE_PROJECT_NAME}
-                           PRIVATE ${CMAKE_SOURCE_DIR}/src)
+# --- Platform-independent build settings ---
 
-target_link_libraries(
-  ${CMAKE_PROJECT_NAME} PRIVATE OBS::libobs rlottie::rlottie)
+target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
-target_compile_features(${CMAKE_PROJECT_NAME} PRIVATE cxx_std_17)
+target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE OBS::libobs rlottie::rlottie)
 
 # --- End of section ---
 
@@ -68,33 +75,29 @@ if(OS_WINDOWS)
   configure_file(cmake/bundle/windows/installer-Windows.iss.in
                  ${CMAKE_BINARY_DIR}/installer-Windows.generated.iss)
 
+  configure_file(cmake/bundle/windows/resource.rc.in ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.rc)
+  target_sources(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.rc)
+
   if(MSVC)
-    target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE /MP /d2FH4-)
+    target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE /W4)
   endif()
   # --- End of section ---
 
   # -- macOS specific build settings and tasks --
 elseif(OS_MACOS)
-  configure_file(cmake/bundle/macos/installer-macOS.pkgproj.in
-                 ${CMAKE_BINARY_DIR}/installer-macOS.generated.pkgproj)
+  configure_file(cmake/bundle/macos/installer-macos.pkgproj.in
+                 ${CMAKE_BINARY_DIR}/installer-macos.generated.pkgproj)
 
   set(MACOSX_PLUGIN_GUI_IDENTIFIER "${MACOS_BUNDLEID}")
   set(MACOSX_PLUGIN_BUNDLE_VERSION "${CMAKE_PROJECT_VERSION}")
   set(MACOSX_PLUGIN_SHORT_VERSION_STRING "1")
 
-  target_compile_options(
-    ${CMAKE_PROJECT_NAME}
-    PRIVATE -Wall -Wextra -Werror-implicit-function-declaration -stdlib=libc++
-            -fvisibility=default)
-
-  set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES PREFIX "")
+  target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -Wall)
   # --- End of section ---
 
   # --- Linux-specific build settings and tasks ---
 else()
-  target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -Wall -Wextra)
-
-  set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES PREFIX "")
+  target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -Wall)
 endif()
 # --- End of section ---
 
diff --git a/buildspec.json b/buildspec.json
index a24b8ee..1807587 100644
--- a/buildspec.json
+++ b/buildspec.json
@@ -1,56 +1,86 @@
 {
     "dependencies": {
         "obs-studio": {
-            "version": "27.2.3",
+            "version": "28.0.1",
             "repository": "https://github.com/obsproject/obs-studio.git",
             "branch": "master",
-            "hash": "13f2d7925ff49938e3b286a3b9a65d50c1491ec1"
+            "hash": "e8dc70d0eef4503378d6ac300e680215eb5c9379"
         },
-        "obs-deps": {
-            "macos-x86_64": {
-                "version": "2022-02-13",
-                "hash": "1a8715d66e664b857942deaded0dc46c4f6cd22e88f01ed1188f3bd3fcf632c4"
-            },
-            "macos-arm64": {
-                "version": "2022-02-13",
-                "hash": "2cfcaf05765400c696908f242aea87b6e1848e1a48cd3edc2eb7f8cb249c9d48"
-            },
-            "macos-universal": {
-                "version": "2022-02-13",
-                "hash": "77471b1d345a768e8efec3f6ad9dc79f3c7cd34840b66f721b80025d29713f5d"
-            },
-            "windows-x64": {
-                "version": "2022-03-16",
-                "hash": "ed73757d1faee1b8c4a9aeca539e1149704e430085608990771402e60074eec7"
-            },
-            "windows-x86": {
-                "version": "2022-03-16",
-                "hash": "4751f68488cf6d5dcc79fbf6735762154847ca509d669539b241bf4e5cbf7751"
+        "prebuilt": {
+            "version": "2022-08-02",
+            "baseUrl": "https://github.com/obsproject/obs-deps/releases/download",
+            "label": "Pre-built obs-deps",
+            "hashes": {
+                "macos-x86_64": "7637e52305e6fc53014b5aabd583f1a4490b1d97450420e977cae9a336a29525",
+                "macos-arm64": "755e0fa69b17a3ae444e1befa9d91d77e3cafe628fbd1c6333686091826595cd",
+                "macos-universal": "de057e73e6fe0825664c258ca2dd6798c41ae580bf4d896e1647676a4941934a",
+                "windows-x64": "2192d8ce780c4281b807cd457994963669e5202659ecd92f19b54c3e7d0c1915",
+                "windows-x86": "9f8582ab5891b000869d6484ea591add9fbac9f1c91b56c7b85fdfd56a261c1b"
             }
         },
-        "obs-deps-qt": {
-            "macos-x86_64": {
-                "version": "2022-02-13",
-                "hash": "35a58fee8dfd70d3d2dcc0ae0b77132c04a451c6f041a02dc41b207b375fc74b"
+        "qt5": {
+            "version": "2022-08-02",
+            "baseUrl": "https://github.com/obsproject/obs-deps/releases/download",
+            "label": "Pre-built Qt5",
+            "hashes": {
+                "macos-x86_64": "3d0381a52b0e4d49967936c4357f79ac711f43564329304a6db5c90edadd2697",
+                "macos-arm64": "f4b32548c0530f121956bf0a9a70c36ecbbfca81073d39c396a1759baf2a05c3",
+                "macos-universal": "9a6cf3b9a6c9efee6ba10df649202e8075e99f3c54ae88dc9a36dbc9d7471c1e",
+                "windows-x64": "6488a33a474f750d5a4a268a5e20c78bb40799d99136a1b7ce3365a843cb2fd7",
+                "windows-x86": "a916e09b0a874036801deab2c8a7ec14fdf5d268aa5511eac5bf40727e0c4e33"
             },
-            "macos-arm64": {
-                "version": "2022-02-13",
-                "hash": "e99146b9c7775c245a2d22f2ef24fc111fccd71bad0f03b64db707124ffb8707"
-            },
-            "macos-universal": {
-                "version": "2022-02-13",
-                "hash": "13fbcc45fd9d08b30e702d481fe4d58b23f93aa06848cede4ebe0956c79a5e8a"
-            },
-            "windows-x64": {
-                "version": "2022-03-16",
-                "hash": "4a5faed9bad327be079e08ed6715a287db8936d20e51b9cdfc7eb52d0a57c629"
+            "pdb-hashes": {
+                "windows-x64": "e0e5070143fcad9311a68ce5685d8ba8f34f581ed6942b7a92d360f94ca1ba11",
+                "windows-x86": "36642d1052aa461964f46c17610477b0d9b9defbe2d745ccaacb85f805c1bec2"
+            }
+        },
+        "qt6": {
+            "version": "2022-08-02",
+            "baseUrl": "https://github.com/obsproject/obs-deps/releases/download",
+            "label": "Pre-built Qt6",
+            "hashes": {
+                "macos-x86_64": "a83f72a11023b03b6cb2dc365f0a66ad9df31163bbb4fe2df32d601856a9fad3",
+                "macos-arm64": "2f30af90c049670a5660656adbb440668aa1b0567f75a5f29e1def9108928403",
+                "macos-universal": "252e6684f43ab9c6f262c73af739e2296ce391b998da2c4ee04c254aaa07db18",
+                "windows-x64": "e5509b54196a3f935250cc4b9c54160c8e588fd0f92bc078a2a64f9d9e2e4e93",
+                "windows-x86": "24fc03bef153a0e027c1479e42eb08097a4ea1d70a4710825be0783d0626cb0d"
             },
-            "windows-x86": {
-                "version": "2022-03-16",
-                "hash": "6664bc60523a8c7c08690f6b800d8d57d830605b9c25d2ce41132c422b0c6e29"
+            "pdb-hashes": {
+                "windows-x64": "60e5b1d2bc4d7c431bc05f14e3b1e85e088788c372fa85f58717cd6c49555a46",
+                "windows-x86": "f34d1a89fc85d92913bd6c7f75ec5c28471d74db708c98161100bc8b75f8fc63"
             }
         }
     },
+    "platformConfig": {
+        "macos-x86_64": {
+            "qtVersion": 6,
+            "deploymentTarget": "10.15"
+        },
+        "macos-arm64": {
+            "qtVersion": 6,
+            "deploymentTarget": "11.0"
+        },
+        "macos-universal": {
+            "qtVersion": 6,
+            "deploymentTarget": "10.15"
+        },
+        "windows-x64": {
+            "qtVersion": 6,
+            "visualStudio": "Visual Studio 17 2022",
+            "platformSDK": "10.0.20348.0"
+        },
+        "windows-x86": {
+            "qtVersion": 6,
+            "visualStudio": "Visual Studio 17 2022",
+            "platformSDK": "10.0.20348.0"
+        },
+        "linux-x86_64": {
+            "qtVersion": 6
+        },
+        "linux-aarch64": {
+            "qtVersion": 6
+        }
+    },
     "name": "obs-lottie",
     "version": "1.0.0"
 }
diff --git a/cmake/ObsPluginHelpers.cmake b/cmake/ObsPluginHelpers.cmake
index d231456..450c46d 100644
--- a/cmake/ObsPluginHelpers.cmake
+++ b/cmake/ObsPluginHelpers.cmake
@@ -3,7 +3,6 @@ if(POLICY CMP0087)
 endif()
 
 set(OBS_STANDALONE_PLUGIN_DIR ${CMAKE_SOURCE_DIR}/release)
-set(INCLUDED_LIBOBS_CMAKE_MODULES ON)
 
 include(GNUInstallDirs)
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
@@ -18,8 +17,8 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
   set(OS_POSIX OFF)
 endif()
 
-# Old-Style plugin detected, find "modern" libobs variant instead and set global
-# include directories to fix "bad" plugin behaviour
+# Old-Style plugin detected, find "modern" libobs variant instead and set global include directories
+# to fix "bad" plugin behavior
 if(DEFINED LIBOBS_INCLUDE_DIR AND NOT TARGET OBS::libobs)
   message(
     DEPRECATION
@@ -37,118 +36,318 @@ if(DEFINED LIBOBS_INCLUDE_DIR AND NOT TARGET OBS::libobs)
   endif()
 endif()
 
+# Set macOS and Windows specific if default value is used
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND (OS_WINDOWS OR OS_MACOS))
   set(CMAKE_INSTALL_PREFIX
       ${OBS_STANDALONE_PLUGIN_DIR}
       CACHE STRING "Directory to install OBS plugin after building" FORCE)
 endif()
 
+# Set default build type to RelWithDebInfo and specify allowed alternative values
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE
       "RelWithDebInfo"
-      CACHE STRING
-            "OBS build type [Release, RelWithDebInfo, Debug, MinSizeRel]" FORCE)
-  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Release RelWithDebInfo
-                                               Debug MinSizeRel)
+      CACHE STRING "OBS build type [Release, RelWithDebInfo, Debug, MinSizeRel]" FORCE)
+  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Release RelWithDebInfo Debug MinSizeRel)
 endif()
 
+# Set default Qt version to AUTO, preferring an available Qt6 with a fallback to Qt5
 if(NOT QT_VERSION)
   set(QT_VERSION
-      "5"
-      CACHE STRING "OBS Qt version [5, 6]" FORCE)
-  set_property(CACHE QT_VERSION PROPERTY STRINGS 5 6)
+      AUTO
+      CACHE STRING "OBS Qt version [AUTO, 6, 5]" FORCE)
+  set_property(CACHE QT_VERSION PROPERTY STRINGS AUTO 6 5)
 endif()
 
+# Macro to find best possible Qt version for use with the project:
+#
+# * Use QT_VERSION value as a hint for desired Qt version
+# * If "AUTO" was specified, prefer Qt6 over Qt5
+# * Creates versionless targets of desired component if none had been created by Qt itself (Qt
+#   versions < 5.15)
+#
 macro(find_qt)
-  set(oneValueArgs VERSION)
   set(multiValueArgs COMPONENTS COMPONENTS_WIN COMPONENTS_MAC COMPONENTS_LINUX)
-  cmake_parse_arguments(FIND_QT "" "${oneValueArgs}" "${multiValueArgs}"
-                        ${ARGN})
+  cmake_parse_arguments(FIND_QT "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  # Do not use versionless targets in the first step to avoid Qt::Core being clobbered by later
+  # opportunistic find_package runs
+  set(QT_NO_CREATE_VERSIONLESS_TARGETS ON)
+
+  # Loop until _QT_VERSION is set or FATAL_ERROR aborts script execution early
+  while(NOT _QT_VERSION)
+    if(QT_VERSION STREQUAL AUTO AND NOT _QT_TEST_VERSION)
+      set(_QT_TEST_VERSION 6)
+    elseif(NOT QT_VERSION STREQUAL AUTO)
+      set(_QT_TEST_VERSION ${QT_VERSION})
+    endif()
 
-  if(OS_WINDOWS)
     find_package(
-      Qt${FIND_QT_VERSION}
-      COMPONENTS ${FIND_QT_COMPONENTS} ${FIND_QT_COMPONENTS_WIN}
-      REQUIRED)
+      Qt${_QT_TEST_VERSION}
+      COMPONENTS Core
+      QUIET)
+
+    if(TARGET Qt${_QT_TEST_VERSION}::Core)
+      set(_QT_VERSION
+          ${_QT_TEST_VERSION}
+          CACHE INTERNAL "")
+      message(STATUS "Qt version found: ${_QT_VERSION}")
+      unset(_QT_TEST_VERSION)
+      break()
+    elseif(QT_VERSION STREQUAL AUTO)
+      if(_QT_TEST_VERSION EQUAL 6)
+        message(WARNING "Qt6 was not found, falling back to Qt5")
+        set(_QT_TEST_VERSION 5)
+        continue()
+      endif()
+    endif()
+    message(FATAL_ERROR "Neither Qt6 nor Qt5 found.")
+  endwhile()
+
+  # Enable versionless targets for the remaining Qt components
+  set(QT_NO_CREATE_VERSIONLESS_TARGETS OFF)
+
+  set(_QT_COMPONENTS ${FIND_QT_COMPONENTS})
+  if(OS_WINDOWS)
+    list(APPEND _QT_COMPONENTS ${FIND_QT_COMPONENTS_WIN})
   elseif(OS_MACOS)
-    find_package(
-      Qt${FIND_QT_VERSION}
-      COMPONENTS ${FIND_QT_COMPONENTS} ${FIND_QT_COMPONENTS_MAC}
-      REQUIRED)
+    list(APPEND _QT_COMPONENTS ${FIND_QT_COMPONENTS_MAC})
   else()
-    find_package(
-      Qt${FIND_QT_VERSION}
-      COMPONENTS ${FIND_QT_COMPONENTS} ${FIND_QT_COMPONENTS_LINUX}
-      REQUIRED)
+    list(APPEND _QT_COMPONENTS ${FIND_QT_COMPONENTS_LINUX})
   endif()
 
-  foreach(_COMPONENT IN LISTS FIND_QT_COMPONENTS FIND_QT_COMPONENTS_WIN
-                              FIND_QT_COMPONENTS_MAC FIND_QT_COMPONENTS_LINUX)
-    if(NOT TARGET Qt::${_COMPONENT} AND TARGET
-                                        Qt${FIND_QT_VERSION}::${_COMPONENT})
+  find_package(
+    Qt${_QT_VERSION}
+    COMPONENTS ${_QT_COMPONENTS}
+    REQUIRED)
+
+  list(APPEND _QT_COMPONENTS Core)
+
+  if("Gui" IN_LIST FIND_QT_COMPONENTS_LINUX)
+    list(APPEND _QT_COMPONENTS "GuiPrivate")
+  endif()
 
+  # Check for versionless targets of each requested component and create if necessary
+  foreach(_COMPONENT IN LISTS _QT_COMPONENTS)
+    if(NOT TARGET Qt::${_COMPONENT} AND TARGET Qt${_QT_VERSION}::${_COMPONENT})
       add_library(Qt::${_COMPONENT} INTERFACE IMPORTED)
-      set_target_properties(
-        Qt::${_COMPONENT} PROPERTIES INTERFACE_LINK_LIBRARIES
-                                     "Qt${FIND_QT_VERSION}::${_COMPONENT}")
+      set_target_properties(Qt::${_COMPONENT} PROPERTIES INTERFACE_LINK_LIBRARIES
+                                                         Qt${_QT_VERSION}::${_COMPONENT})
     endif()
   endforeach()
 endmacro()
 
-find_qt(VERSION ${QT_VERSION} COMPONENTS Widgets Core)
-
-file(RELATIVE_PATH RELATIVE_INSTALL_PATH ${CMAKE_SOURCE_DIR}
-     ${CMAKE_INSTALL_PREFIX})
+# Set relative path variables for file configurations
+file(RELATIVE_PATH RELATIVE_INSTALL_PATH ${CMAKE_SOURCE_DIR} ${CMAKE_INSTALL_PREFIX})
 file(RELATIVE_PATH RELATIVE_BUILD_PATH ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
 
-# Set up OS-specific environment and helper functions
+if(OS_POSIX)
+  # Set default GCC/clang compile options:
+  #
+  # * Treat warnings as errors
+  # * Enable extra warnings, https://clang.llvm.org/docs/DiagnosticsReference.html#wextra
+  # * Warning about usage of variable length array,
+  #   https://clang.llvm.org/docs/DiagnosticsReference.html#wvla
+  # * Warning about bad format specifiers,
+  #   https://clang.llvm.org/docs/DiagnosticsReference.html#wformat
+  # * Warning about non-strings used as format strings,
+  #   https://clang.llvm.org/docs/DiagnosticsReference.html#wformat-security
+  # * Warning about non-exhaustive switch blocks,
+  #   https://clang.llvm.org/docs/DiagnosticsReference.html#wswitch
+  # * Warning about unused parameters,
+  #   https://clang.llvm.org/docs/DiagnosticsReference.html#wunused-parameter
+  # * DISABLE warning about unused functions,
+  #   https://clang.llvm.org/docs/DiagnosticsReference.html#wunused-function
+  # * DISABLE warning about missing field initializers,
+  #   https://clang.llvm.org/docs/DiagnosticsReference.html#wmissing-field-initializers
+  # * DISABLE strict aliasing optimisations
+  # * C ONLY - treat implicit function declarations (use before declare) as errors,
+  #   https://clang.llvm.org/docs/DiagnosticsReference.html#wimplicit-function-declaration
+  # * C ONLY - DISABLE warning about missing braces around subobject initalizers,
+  #   https://clang.llvm.org/docs/DiagnosticsReference.html#wmissing-braces
+  # * C ONLY, Clang ONLY - Warning about implicit conversion of NULL to another type,
+  #   https://clang.llvm.org/docs/DiagnosticsReference.html#wnull-conversion
+  # * C & C++, Clang ONLY - Disable warning about integer conversion losing precision,
+  #   https://clang.llvm.org/docs/DiagnosticsReference.html#wshorten-64-to-32
+  # * C++, GCC ONLY - Warning about implicit conversion of NULL to another type
+  # * Enable color diagnostics on Clang (CMAKE_COLOR_DIAGNOSTICS available in CMake 3.24)
+  target_compile_options(
+    ${CMAKE_PROJECT_NAME}
+    PRIVATE
+      -Werror
+      -Wextra
+      -Wvla
+      -Wformat
+      -Wformat-security
+      -Wswitch
+      -Wunused-parameter
+      -Wno-unused-function
+      -Wno-missing-field-initializers
+      -fno-strict-aliasing
+      "$<$<COMPILE_LANGUAGE:C>:-Werror-implicit-function-declaration;-Wno-missing-braces>"
+      "$<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang>:-Wnull-conversion;-Wno-error=shorten-64-to-32;-fcolor-diagnostics>"
+      "$<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wnull-conversion;-Wno-error=shorten-64-to-32;-fcolor-diagnostics>"
+      "$<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wconversion-null>"
+      "$<$<CONFIG:DEBUG>:-DDEBUG=1;-D_DEBUG=1>")
+
+  # GCC 12.1.0 has a regression bug which trigger maybe-uninitialized warnings where there is not.
+  # (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105562)
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL "12.1.0")
+    target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -Wno-error=maybe-uninitialized)
+  endif()
+
+  if(NOT CCACHE_SET)
+    # Try to find and enable ccache
+    find_program(CCACHE_PROGRAM "ccache")
+    set(CCACHE_SUPPORT
+        ON
+        CACHE BOOL "Enable ccache support")
+    mark_as_advanced(CCACHE_PROGRAM)
+    if(CCACHE_PROGRAM AND CCACHE_SUPPORT)
+      set(CMAKE_CXX_COMPILER_LAUNCHER
+          ${CCACHE_PROGRAM}
+          CACHE INTERNAL "")
+      set(CMAKE_C_COMPILER_LAUNCHER
+          ${CCACHE_PROGRAM}
+          CACHE INTERNAL "")
+      set(CMAKE_OBJC_COMPILER_LAUNCHER
+          ${CCACHE_PROGRAM}
+          CACHE INTERNAL "")
+      set(CMAKE_OBJCXX_COMPILER_LAUNCHER
+          ${CCACHE_PROGRAM}
+          CACHE INTERNAL "")
+      set(CMAKE_CUDA_COMPILER_LAUNCHER
+          ${CCACHE_PROGRAM}
+          CACHE INTERNAL "") # CMake 3.9+
+      set(CCACHE_SET
+          ON
+          CACHE INTERNAL "")
+    endif()
+  endif()
+endif()
+
+# Set required C++ standard to C++17
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+# Get lowercase host architecture for easier comparison
+if(MSVC_CXX_ARCHITECTURE_ID)
+  string(TOLOWER ${MSVC_CXX_ARCHITECTURE_ID} _HOST_ARCH)
+else()
+  string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} _HOST_ARCH)
+endif()
+
+if(_HOST_ARCH MATCHES "i[3-6]86|x86|x64|x86_64|amd64" AND NOT CMAKE_OSX_ARCHITECTURES STREQUAL
+                                                          "arm64")
+  # Enable MMX, SSE and SSE2 on compatible host systems (assuming no cross-compile)
+  set(ARCH_SIMD_FLAGS -mmmx -msse -msse2)
+elseif(_HOST_ARCH MATCHES "arm64|arm64e|aarch64")
+  # Enable available built-in SIMD support in Clang and GCC
+  if(CMAKE_C_COMPILER_ID MATCHES "^(Apple)?Clang|GNU" OR CMAKE_CXX_COMPILER_ID MATCHES
+                                                         "^(Apple)?Clang|GNU")
+    include(CheckCCompilerFlag)
+    include(CheckCXXCompilerFlag)
+
+    check_c_compiler_flag("-fopenmp-simd" C_COMPILER_SUPPORTS_OPENMP_SIMD)
+    check_cxx_compiler_flag("-fopenmp-simd" CXX_COMPILER_SUPPORTS_OPENMP_SIMD)
+    target_compile_options(
+      ${CMAKE_PROJECT_NAME}
+      PRIVATE
+        -DSIMDE_ENABLE_OPENMP
+        "$<$<AND:$<COMPILE_LANGUAGE:C>,$<BOOL:C_COMPILER_SUPPORTS_OPENMP_SIMD>>:-fopenmp-simd>"
+        "$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<BOOL:CXX_COMPILER_SUPPORTS_OPENMP_SIMD>>:-fopenmp-simd>")
+  endif()
+endif()
+
+# macOS specific settings
 if(OS_MACOS)
-  find_program(CCACHE_PROGRAM "ccache")
-  set(CCACHE_SUPPORT
-      ON
-      CACHE BOOL "Enable ccache support")
-  mark_as_advanced(CCACHE_PROGRAM)
-  if(CCACHE_PROGRAM AND CCACHE_SUPPORT)
-    set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
-    set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
-    set(CMAKE_OBJC_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
-    set(CMAKE_OBJCXX_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
-    set(CMAKE_CUDA_COMPILER_LAUNCHER ${CCACHE_PROGRAM}) # CMake 3.9+
+  # Set macOS-specific C++ standard library
+  target_compile_options(
+    ${CMAKE_PROJECT_NAME}
+    PRIVATE "$<$<COMPILE_LANG_AND_ID:OBJC,AppleClang,Clang>:-fcolor-diagnostics>" -stdlib=libc++)
+
+  # Set build architecture to host architecture by default
+  if(NOT CMAKE_OSX_ARCHITECTURES)
+    set(CMAKE_OSX_ARCHITECTURES
+        ${CMAKE_HOST_SYSTEM_PROCESSOR}
+        CACHE STRING "Build architecture for macOS" FORCE)
+  endif()
+  set_property(CACHE CMAKE_OSX_ARCHITECTURES PROPERTY STRINGS arm64 x86_64 "arm64;x86_64")
+
+  # Set deployment target to 11.0 for Apple Silicon or 10.15 for Intel and Universal builds
+  if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
+    set(CMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET[arch=arm64] "11.0")
+    set(CMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET[arch=x86_64] "10.15")
+
+    if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
+      set(_MACOS_DEPLOYMENT_TARGET "11.0")
+    else()
+      set(_MACOS_DEPLOYMENT_TARGET "10.15")
+    endif()
+
+    set(CMAKE_OSX_DEPLOYMENT_TARGET
+        ${_MACOS_DEPLOYMENT_TARGET}
+        CACHE STRING
+              "Minimum macOS version to target for deployment (at runtime); newer APIs weak linked"
+              FORCE)
+    unset(_MACOS_DEPLOYMENT_TARGET)
+  endif()
+
+  set_property(CACHE CMAKE_OSX_DEPLOYMENT_TARGET PROPERTY STRINGS 13.0 12.0 11.0 10.15)
+
+  # Override macOS install directory
+  if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    set(CMAKE_INSTALL_PREFIX
+        ${CMAKE_BINARY_DIR}/install
+        CACHE STRING "Directory to install OBS to after building" FORCE)
+  endif()
+
+  # Set up codesigning for Xcode builds with team IDs or standalone builds with developer identity
+  if(NOT OBS_BUNDLE_CODESIGN_TEAM)
+    if(NOT OBS_BUNDLE_CODESIGN_IDENTITY)
+      set(OBS_BUNDLE_CODESIGN_IDENTITY
+          "-"
+          CACHE STRING "OBS code signing identity for macOS" FORCE)
+    endif()
+    set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ${OBS_BUNDLE_CODESIGN_IDENTITY})
+  else()
+    # Team ID specified, warn if Xcode generator is not used and fall back to ad-hoc signing
+    if(NOT XCODE)
+      message(
+        WARNING
+          "Code signing with a team identifier is only supported with the Xcode generator. Using ad-hoc code signature instead."
+      )
+      if(NOT OBS_BUNDLE_CODESIGN_IDENTITY)
+        set(OBS_BUNDLE_CODESIGN_IDENTITY
+            "-"
+            CACHE STRING "OBS code signing identity for macOS" FORCE)
+      endif()
+    else()
+      unset(OBS_BUNDLE_CODESIGN_IDENTITY)
+      set_property(CACHE OBS_BUNDLE_CODESIGN_TEAM PROPERTY HELPSTRING
+                                                           "OBS code signing team for macOS")
+      set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_STYLE Automatic)
+      set(CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${OBS_BUNDLE_CODESIGN_TEAM})
+    endif()
   endif()
 
-  set(CMAKE_OSX_ARCHITECTURES
-      "x86_64"
-      CACHE STRING
-            "OBS build architecture for macOS - x86_64 required at least")
-  set_property(CACHE CMAKE_OSX_ARCHITECTURES PROPERTY STRINGS x86_64 arm64
-                                                      "x86_64;arm64")
-
-  set(CMAKE_OSX_DEPLOYMENT_TARGET
-      "10.13"
-      CACHE STRING "OBS deployment target for macOS - 10.15+ required")
-  set_property(CACHE CMAKE_OSX_DEPLOYMENT_TARGET PROPERTY STRINGS 10.15 11 12)
-
-  set(OBS_BUNDLE_CODESIGN_IDENTITY
-      "-"
-      CACHE STRING "OBS code signing identity for macOS")
+  # Set path to entitlements property list for codesigning. Entitlements should match the host
+  # binary, in this case OBS.app.
   set(OBS_CODESIGN_ENTITLEMENTS
       ${CMAKE_SOURCE_DIR}/cmake/bundle/macos/entitlements.plist
       CACHE INTERNAL "Path to codesign entitlements plist")
+  # Enable linker codesigning by default. Building OBS or plugins on host systems older than macOS
+  # 10.15 is not supported
   set(OBS_CODESIGN_LINKER
       ON
-      CACHE BOOL "Enable linker code-signing on macOS (macOS 11+ required)")
-
-  # Xcode configuration
-  if(XCODE)
-    # Tell Xcode to pretend the linker signed binaries so that editing with
-    # install_name_tool preserves ad-hoc signatures. This option is supported by
-    # codesign on macOS 11 or higher. See CMake Issue 21854:
-    # https://gitlab.kitware.com/cmake/cmake/-/issues/21854
-
-    set(CMAKE_XCODE_GENERATE_SCHEME ON)
-    if(OBS_CODESIGN_LINKER)
-      set(CMAKE_XCODE_ATTRIBUTE_OTHER_CODE_SIGN_FLAGS "-o linker-signed")
-    endif()
+      CACHE BOOL "Enable linker codesigning on macOS (macOS 11+ required)")
+
+  # Tell Xcode to pretend the linker signed binaries so that editing with install_name_tool
+  # preserves ad-hoc signatures. This option is supported by codesign on macOS 11 or higher. See
+  # CMake Issue 21854: https://gitlab.kitware.com/cmake/cmake/-/issues/21854
+  if(OBS_CODESIGN_LINKER)
+    set(CMAKE_XCODE_ATTRIBUTE_OTHER_CODE_SIGN_FLAGS "-o linker-signed")
   endif()
 
   # Set default options for bundling on macOS
@@ -158,7 +357,13 @@ if(OS_MACOS)
   set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks/")
   set(CMAKE_INSTALL_RPATH_USE_LINK_PATH OFF)
 
+  # Helper function for plugin targets (macOS version)
   function(setup_plugin_target target)
+    # Sanity check for required bundle information
+    #
+    # * Bundle identifier
+    # * Bundle version
+    # * Short version string
     if(NOT DEFINED MACOSX_PLUGIN_GUI_IDENTIFIER)
       message(
         FATAL_ERROR
@@ -180,14 +385,15 @@ if(OS_MACOS)
       )
     endif()
 
+    # Set variables for automatic property list generation
     set(MACOSX_PLUGIN_BUNDLE_NAME
         "${target}"
         PARENT_SCOPE)
     set(MACOSX_PLUGIN_BUNDLE_VERSION
-        "${MACOSX_BUNDLE_BUNDLE_VERSION}"
+        "${MACOSX_PLUGIN_BUNDLE_VERSION}"
         PARENT_SCOPE)
     set(MACOSX_PLUGIN_SHORT_VERSION_STRING
-        "${MACOSX_BUNDLE_SHORT_VERSION_STRING}"
+        "${MACOSX_PLUGIN_SHORT_VERSION_STRING}"
         PARENT_SCOPE)
     set(MACOSX_PLUGIN_EXECUTABLE_NAME
         "${target}"
@@ -196,76 +402,77 @@ if(OS_MACOS)
         "BNDL"
         PARENT_SCOPE)
 
+    # Set installation target to install prefix root (default for bundles)
     install(
       TARGETS ${target}
       LIBRARY DESTINATION "."
               COMPONENT obs_plugins
               NAMELINK_COMPONENT ${target}_Development)
 
-    set(_COMMAND
-        "${CMAKE_INSTALL_NAME_TOOL} \\
-      -change ${CMAKE_PREFIX_PATH}/lib/QtWidgets.framework/Versions/${QT_VERSION}/QtWidgets @rpath/QtWidgets.framework/Versions/${QT_VERSION}/QtWidgets \\
-      -change ${CMAKE_PREFIX_PATH}/lib/QtCore.framework/Versions/${QT_VERSION}/QtCore @rpath/QtCore.framework/Versions/${QT_VERSION}/QtCore \\
-      -change ${CMAKE_PREFIX_PATH}/lib/QtGui.framework/Versions/${QT_VERSION}/QtGui @rpath/QtGui.framework/Versions/${QT_VERSION}/QtGui \\
-      \\\"\${CMAKE_INSTALL_PREFIX}/${target}.plugin/Contents/MacOS/${target}\\\""
-    )
-    install(CODE "execute_process(COMMAND /bin/sh -c \"${_COMMAND}\")"
-            COMPONENT obs_plugins)
+    if(TARGET Qt::Core)
+      # Framework version has changed between Qt5 (uses wrong numerical version) and Qt6 (uses
+      # correct alphabetical version)
+      if(${_QT_VERSION} EQUAL 5)
+        set(_QT_FW_VERSION "${QT_VERSION}")
+      else()
+        set(_QT_FW_VERSION "A")
+      endif()
+
+      # Set up install-time command to fix Qt library references to point into OBS.app bundle
+      set(_COMMAND
+          "${CMAKE_INSTALL_NAME_TOOL} \\
+        -change ${CMAKE_PREFIX_PATH}/lib/QtWidgets.framework/Versions/${QT_VERSION}/QtWidgets @rpath/QtWidgets.framework/Versions/${_QT_FW_VERSION}/QtWidgets \\
+        -change ${CMAKE_PREFIX_PATH}/lib/QtCore.framework/Versions/${QT_VERSION}/QtCore @rpath/QtCore.framework/Versions/${_QT_FW_VERSION}/QtCore \\
+        -change ${CMAKE_PREFIX_PATH}/lib/QtGui.framework/Versions/${QT_VERSION}/QtGui @rpath/QtGui.framework/Versions/${_QT_FW_VERSION}/QtGui \\
+        \\\"\${CMAKE_INSTALL_PREFIX}/${target}.plugin/Contents/MacOS/${target}\\\"")
+      install(CODE "execute_process(COMMAND /bin/sh -c \"${_COMMAND}\")" COMPONENT obs_plugins)
+      unset(_QT_FW_VERSION)
+    endif()
 
+    # Set macOS bundle properties
+    set_target_properties(
+      ${target}
+      PROPERTIES PREFIX ""
+                 BUNDLE ON
+                 BUNDLE_EXTENSION "plugin"
+                 OUTPUT_NAME ${target}
+                 MACOSX_BUNDLE_INFO_PLIST
+                 "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/bundle/macOS/Plugin-Info.plist.in"
+                 XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "${MACOSX_PLUGIN_GUI_IDENTIFIER}"
+                 XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS
+                 "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/bundle/macOS/entitlements.plist")
+
+    # If not building with Xcode, manually code-sign the plugin
     if(NOT XCODE)
       set(_COMMAND
           "/usr/bin/codesign --force \\
           --sign \\\"${OBS_BUNDLE_CODESIGN_IDENTITY}\\\" \\
           --options runtime \\
           --entitlements \\\"${CMAKE_CURRENT_FUNCTION_LIST_DIR}/bundle/macOS/entitlements.plist\\\" \\
-          \\\"${CMAKE_INSTALL_PREFIX}/${target}.plugin\\\"")
-      install(CODE "execute_process(COMMAND /bin/sh -c \"${_COMMAND}\")"
-              COMPONENT obs_plugins)
+          \\\"\${CMAKE_INSTALL_PREFIX}/${target}.plugin\\\"")
+      install(CODE "execute_process(COMMAND /bin/sh -c \"${_COMMAND}\")" COMPONENT obs_plugins)
     endif()
 
-    set_target_properties(
-      ${target}
-      PROPERTIES
-        BUNDLE ON
-        BUNDLE_EXTENSION "plugin"
-        OUTPUT_NAME ${target}
-        MACOSX_BUNDLE_INFO_PLIST
-        "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/bundle/macOS/Plugin-Info.plist.in"
-        XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER
-        "${MACOSX_PLUGIN_GUI_IDENTIFIER}"
-        XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "${OBS_BUNDLE_CODESIGN_IDENTITY}"
-        XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS
-        "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/bundle/macOS/entitlements.plist")
-
-    add_custom_command(
-      TARGET ${target}
-      POST_BUILD
-      COMMAND
-        /bin/sh -c
-        "codesign --force --sign \"-\" $<$<BOOL:${OBS_CODESIGN_LINKER}>:--options linker-signed >\"$<TARGET_BUNDLE_DIR:${target}>\""
-      COMMENT "Codesigning ${target}"
-      VERBATIM)
-
     install_bundle_resources(${target})
   endfunction()
 
+  # Helper function to add resources from "data" directory as bundle resources
   function(install_bundle_resources target)
     if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/data)
       file(GLOB_RECURSE _DATA_FILES "${CMAKE_CURRENT_SOURCE_DIR}/data/*")
       foreach(_DATA_FILE IN LISTS _DATA_FILES)
-        file(RELATIVE_PATH _RELATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/data/
-             ${_DATA_FILE})
+        file(RELATIVE_PATH _RELATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/data/ ${_DATA_FILE})
         get_filename_component(_RELATIVE_PATH ${_RELATIVE_PATH} PATH)
         target_sources(${target} PRIVATE ${_DATA_FILE})
-        set_source_files_properties(
-          ${_DATA_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION
-                                   Resources/${_RELATIVE_PATH})
+        set_source_files_properties(${_DATA_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION
+                                                             Resources/${_RELATIVE_PATH})
         string(REPLACE "\\" "\\\\" _GROUP_NAME ${_RELATIVE_PATH})
         source_group("Resources\\${_GROUP_NAME}" FILES ${_DATA_FILE})
       endforeach()
     endif()
   endfunction()
 else()
+  # Check for target architecture (64bit vs 32bit)
   if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     set(_ARCH_SUFFIX 64)
   else()
@@ -273,21 +480,10 @@ else()
   endif()
   set(OBS_OUTPUT_DIR ${CMAKE_BINARY_DIR}/rundir)
 
+  # Unix specific settings
   if(OS_POSIX)
-    find_program(CCACHE_PROGRAM "ccache")
-    set(CCACHE_SUPPORT
-        ON
-        CACHE BOOL "Enable ccache support")
-    mark_as_advanced(CCACHE_PROGRAM)
-    if(CCACHE_PROGRAM AND CCACHE_SUPPORT)
-      set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
-      set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
-      set(CMAKE_OBJC_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
-      set(CMAKE_OBJCXX_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
-      set(CMAKE_CUDA_COMPILER_LAUNCHER ${CCACHE_PROGRAM}) # CMake 3.9+
-    endif()
-
-    option(LINUX_PORTABLE "Build portable version (Linux)" OFF)
+    # Paths to binaries and plugins differ between portable and non-portable builds on Linux
+    option(LINUX_PORTABLE "Build portable version (Linux)" ON)
     if(NOT LINUX_PORTABLE)
       set(OBS_LIBRARY_DESTINATION ${CMAKE_INSTALL_LIBDIR})
       set(OBS_PLUGIN_DESTINATION ${OBS_LIBRARY_DESTINATION}/obs-plugins)
@@ -296,15 +492,16 @@ else()
     else()
       set(OBS_LIBRARY_DESTINATION bin/${_ARCH_SUFFIX}bit)
       set(OBS_PLUGIN_DESTINATION obs-plugins/${_ARCH_SUFFIX}bit)
-      set(CMAKE_INSTALL_RPATH
-          "$ORIGIN/" "${CMAKE_INSTALL_PREFIX}/${OBS_LIBRARY_DESTINATION}")
+      set(CMAKE_INSTALL_RPATH "$ORIGIN/" "${CMAKE_INSTALL_PREFIX}/${OBS_LIBRARY_DESTINATION}")
       set(OBS_DATA_DESTINATION "data")
     endif()
 
+    # Setup Linux-specific CPack values for "deb" package generation
     if(OS_LINUX)
       set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
       set(CPACK_DEBIAN_PACKAGE_MAINTAINER "${LINUX_MAINTAINER_EMAIL}")
       set(CPACK_PACKAGE_VERSION "${CMAKE_PROJECT_VERSION}")
+      set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-linux-x86_64")
 
       set(CPACK_GENERATOR "DEB")
       set(CPACK_DEBIAN_PACKAGE_DEPENDS
@@ -318,6 +515,7 @@ else()
       endif()
       include(CPack)
     endif()
+    # Windows specific settings
   else()
     set(OBS_LIBRARY_DESTINATION "bin/${_ARCH_SUFFIX}bit")
     set(OBS_LIBRARY32_DESTINATION "bin/32bit")
@@ -327,19 +525,78 @@ else()
     set(OBS_PLUGIN64_DESTINATION "obs-plugins/64bit")
 
     set(OBS_DATA_DESTINATION "data")
+
+    if(MSVC)
+      # Set default Visual Studio CL.exe compile options.
+      #
+      # * Enable building with multiple processes,
+      #   https://docs.microsoft.com/en-us/cpp/build/reference/mp-build-with-multiple-processes?view=msvc-170
+      # * Enable lint-like warnings,
+      #   https://docs.microsoft.com/en-us/cpp/build/reference/compiler-option-warning-level?view=msvc-170
+      # * Enable treating all warnings as errors,
+      #   https://docs.microsoft.com/en-us/cpp/build/reference/compiler-option-warning-level?view=msvc-170
+      # * RelWithDebInfo ONLY - Enable expanding of all functions not explicitly marked for no
+      #   inlining,
+      #   https://docs.microsoft.com/en-us/cpp/build/reference/ob-inline-function-expansion?view=msvc-170
+      # * Enable UNICODE support,
+      #   https://docs.microsoft.com/en-us/windows/win32/learnwin32/working-with-strings#unicode-and-ansi-functions
+      # * DISABLE warnings about using POSIX function names,
+      #   https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-3-c4996?view=msvc-170#posix-function-names
+      # * DISABLE warnings about unsafe CRT library functions,
+      #   https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-3-c4996?view=msvc-170#unsafe-crt-library-functions
+      # * DISABLE warnings about nonstandard nameless structs/unions,
+      #   https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-4-c4201?view=msvc-170
+      target_compile_options(
+        ${CMAKE_PROJECT_NAME}
+        PRIVATE /MP
+                /W3
+                /WX
+                /wd4201
+                "$<$<CONFIG:RELWITHDEBINFO>:/Ob2>"
+                "$<$<CONFIG:DEBUG>:/DDEBUG=1;/D_DEBUG=1>"
+                /DUNICODE
+                /D_UNICODE
+                /D_CRT_SECURE_NO_WARNINGS
+                /D_CRT_NONSTDC_NO_WARNINGS)
+
+      # Set default Visual Studio linker options.
+      #
+      # * Enable removal of functions and data that are never used,
+      #   https://docs.microsoft.com/en-us/cpp/build/reference/opt-optimizations?view=msvc-170
+      # * Enable treating all warnings as errors,
+      #   https://docs.microsoft.com/en-us/cpp/build/reference/wx-treat-linker-warnings-as-errors?view=msvc-170
+      # * x64 ONLY - DISABLE creation of table of safe exception handlers,
+      #   https://docs.microsoft.com/en-us/cpp/build/reference/safeseh-image-has-safe-exception-handlers?view=msvc-170
+      # * Debug ONLY - DISABLE incremental linking,
+      #   https://docs.microsoft.com/en-us/cpp/build/reference/incremental-link-incrementally?view=msvc-170
+      # * RelWithDebInfo ONLY - Disable incremental linking, but enable COMDAT folding,
+      #   https://docs.microsoft.com/en-us/cpp/build/reference/opt-optimizations?view=msvc-170
+      target_link_options(
+        ${CMAKE_PROJECT_NAME}
+        PRIVATE
+        "LINKER:/OPT:REF"
+        "LINKER:/WX"
+        "$<$<NOT:$<EQUAL:${CMAKE_SIZEOF_VOID_P},8>>:LINKER\:/SAFESEH\:NO>"
+        "$<$<CONFIG:DEBUG>:LINKER\:/INCREMENTAL\:NO>"
+        "$<$<CONFIG:RELWITHDEBINFO>:LINKER\:/INCREMENTAL\:NO;/OPT\:ICF>")
+    endif()
   endif()
 
+  # Helper function for plugin targets (Windows and Linux version)
   function(setup_plugin_target target)
+    # Set prefix to empty string to avoid automatic naming of generated library, i.e.
+    # "lib<YOUR_PLUGIN_NAME>"
     set_target_properties(${target} PROPERTIES PREFIX "")
 
+    # Set install directories
     install(
       TARGETS ${target}
-      RUNTIME DESTINATION "${OBS_PLUGIN_DESTINATION}"
-              COMPONENT ${target}_Runtime
+      RUNTIME DESTINATION "${OBS_PLUGIN_DESTINATION}" COMPONENT ${target}_Runtime
       LIBRARY DESTINATION "${OBS_PLUGIN_DESTINATION}"
               COMPONENT ${target}_Runtime
               NAMELINK_COMPONENT ${target}_Development)
 
+    # Set rundir install directory
     install(
       FILES $<TARGET_FILE:${target}>
       DESTINATION $<CONFIG>/${OBS_PLUGIN_DESTINATION}
@@ -347,6 +604,7 @@ else()
       EXCLUDE_FROM_ALL)
 
     if(OS_WINDOWS)
+      # Set install directory for optional PDB symbol files
       install(
         FILES $<TARGET_PDB_FILE:${target}>
         CONFIGURATIONS "RelWithDebInfo" "Debug"
@@ -354,6 +612,7 @@ else()
         COMPONENT ${target}_Runtime
         OPTIONAL)
 
+      # Set rundir install directory for optional PDB symbol files
       install(
         FILES $<TARGET_PDB_FILE:${target}>
         CONFIGURATIONS "RelWithDebInfo" "Debug"
@@ -362,34 +621,27 @@ else()
         OPTIONAL EXCLUDE_FROM_ALL)
     endif()
 
-    if(MSVC)
-      target_link_options(
-        ${target}
-        PRIVATE
-        "LINKER:/OPT:REF"
-        "$<$<NOT:$<EQUAL:${CMAKE_SIZEOF_VOID_P},8>>:LINKER\:/SAFESEH\:NO>"
-        "$<$<CONFIG:DEBUG>:LINKER\:/INCREMENTAL:NO>"
-        "$<$<CONFIG:RELWITHDEBINFO>:LINKER\:/INCREMENTAL:NO>")
-    endif()
-
+    # Add resources from data directory
     setup_target_resources(${target} obs-plugins/${target})
 
+    # Set up plugin for testing in available OBS build on Windows
     if(OS_WINDOWS AND DEFINED OBS_BUILD_DIR)
       setup_target_for_testing(${target} obs-plugins/${target})
     endif()
 
+    # Custom command to install generated plugin into rundir
     add_custom_command(
       TARGET ${target}
       POST_BUILD
       COMMAND
         "${CMAKE_COMMAND}" -DCMAKE_INSTALL_PREFIX=${OBS_OUTPUT_DIR}
-        -DCMAKE_INSTALL_COMPONENT=obs_rundir
-        -DCMAKE_INSTALL_CONFIG_NAME=$<CONFIG> -P
+        -DCMAKE_INSTALL_COMPONENT=obs_rundir -DCMAKE_INSTALL_CONFIG_NAME=$<CONFIG> -P
         ${CMAKE_CURRENT_BINARY_DIR}/cmake_install.cmake
       COMMENT "Installing to plugin rundir"
       VERBATIM)
   endfunction()
 
+  # Helper function to add resources from "data" directory
   function(setup_target_resources target destination)
     if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/data)
       install(
@@ -408,6 +660,10 @@ else()
   endfunction()
 
   if(OS_WINDOWS)
+    # Additional Windows-only helper function to copy plugin to existing OBS development directory:
+    #
+    # Copies plugin with associated PDB symbol files as well as contents of data directory into the
+    # OBS rundir as specified by "OBS_BUILD_DIR".
     function(setup_target_for_testing target destination)
       install(
         FILES $<TARGET_FILE:${target}>
@@ -434,8 +690,7 @@ else()
         POST_BUILD
         COMMAND
           "${CMAKE_COMMAND}" -DCMAKE_INSTALL_PREFIX=${OBS_BUILD_DIR}/rundir
-          -DCMAKE_INSTALL_COMPONENT=obs_testing
-          -DCMAKE_INSTALL_CONFIG_NAME=$<CONFIG> -P
+          -DCMAKE_INSTALL_COMPONENT=obs_testing -DCMAKE_INSTALL_CONFIG_NAME=$<CONFIG> -P
           ${CMAKE_CURRENT_BINARY_DIR}/cmake_install.cmake
         COMMENT "Installing to OBS test directory"
         VERBATIM)
diff --git a/cmake/bundle/macos/installer-macOS.pkgproj.in b/cmake/bundle/macos/installer-macOS.pkgproj.in
deleted file mode 100644
index 8d33d27..0000000
--- a/cmake/bundle/macos/installer-macOS.pkgproj.in
+++ /dev/null
@@ -1,947 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PACKAGES</key>
-	<array>
-		<dict>
-			<key>MUST-CLOSE-APPLICATION-ITEMS</key>
-			<array/>
-			<key>MUST-CLOSE-APPLICATIONS</key>
-			<false/>
-			<key>PACKAGE_FILES</key>
-			<dict>
-				<key>DEFAULT_INSTALL_LOCATION</key>
-				<string>/</string>
-				<key>HIERARCHY</key>
-				<dict>
-					<key>CHILDREN</key>
-					<array>
-						<dict>
-							<key>CHILDREN</key>
-							<array/>
-							<key>GID</key>
-							<integer>80</integer>
-							<key>PATH</key>
-							<string>Applications</string>
-							<key>PATH_TYPE</key>
-							<integer>0</integer>
-							<key>PERMISSIONS</key>
-							<integer>509</integer>
-							<key>TYPE</key>
-							<integer>1</integer>
-							<key>UID</key>
-							<integer>0</integer>
-						</dict>
-						<dict>
-							<key>CHILDREN</key>
-							<array>
-								<dict>
-									<key>CHILDREN</key>
-									<array>
-										<dict>
-											<key>CHILDREN</key>
-											<array>
-												<dict>
-													<key>CHILDREN</key>
-													<array>
-														<dict>
-															<key>BUNDLE_CAN_DOWNGRADE</key>
-															<false/>
-															<key>BUNDLE_POSTINSTALL_PATH</key>
-															<dict>
-																<key>PATH_TYPE</key>
-																<integer>0</integer>
-															</dict>
-															<key>BUNDLE_PREINSTALL_PATH</key>
-															<dict>
-																<key>PATH_TYPE</key>
-																<integer>0</integer>
-															</dict>
-															<key>CHILDREN</key>
-															<array/>
-															<key>GID</key>
-															<integer>80</integer>
-															<key>PATH</key>
-															<string>../@RELATIVE_INSTALL_PATH@/@CMAKE_PROJECT_NAME@.plugin</string>
-															<key>PATH_TYPE</key>
-															<integer>1</integer>
-															<key>PERMISSIONS</key>
-															<integer>493</integer>
-															<key>TYPE</key>
-															<integer>3</integer>
-															<key>UID</key>
-															<integer>0</integer>
-														</dict>
-													</array>
-													<key>GID</key>
-													<integer>80</integer>
-													<key>PATH</key>
-													<string>plugins</string>
-													<key>PATH_TYPE</key>
-													<integer>2</integer>
-													<key>PERMISSIONS</key>
-													<integer>509</integer>
-													<key>TYPE</key>
-													<integer>2</integer>
-													<key>UID</key>
-													<integer>0</integer>
-												</dict>
-											</array>
-											<key>GID</key>
-											<integer>80</integer>
-											<key>PATH</key>
-											<string>obs-studio</string>
-											<key>PATH_TYPE</key>
-											<integer>2</integer>
-											<key>PERMISSIONS</key>
-											<integer>509</integer>
-											<key>TYPE</key>
-											<integer>2</integer>
-											<key>UID</key>
-											<integer>0</integer>
-										</dict>
-									</array>
-									<key>GID</key>
-									<integer>80</integer>
-									<key>PATH</key>
-									<string>Application Support</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Automator</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Documentation</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Extensions</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Filesystems</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Frameworks</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Input Methods</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Internet Plug-Ins</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>LaunchAgents</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>LaunchDaemons</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>PreferencePanes</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Preferences</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>80</integer>
-									<key>PATH</key>
-									<string>Printers</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>PrivilegedHelperTools</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>1005</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>QuickLook</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>QuickTime</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Screen Savers</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Scripts</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Services</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Widgets</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-							</array>
-							<key>GID</key>
-							<integer>0</integer>
-							<key>PATH</key>
-							<string>Library</string>
-							<key>PATH_TYPE</key>
-							<integer>0</integer>
-							<key>PERMISSIONS</key>
-							<integer>493</integer>
-							<key>TYPE</key>
-							<integer>1</integer>
-							<key>UID</key>
-							<integer>0</integer>
-						</dict>
-						<dict>
-							<key>CHILDREN</key>
-							<array>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Shared</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>1023</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-							</array>
-							<key>GID</key>
-							<integer>80</integer>
-							<key>PATH</key>
-							<string>Users</string>
-							<key>PATH_TYPE</key>
-							<integer>0</integer>
-							<key>PERMISSIONS</key>
-							<integer>493</integer>
-							<key>TYPE</key>
-							<integer>1</integer>
-							<key>UID</key>
-							<integer>0</integer>
-						</dict>
-					</array>
-					<key>GID</key>
-					<integer>0</integer>
-					<key>PATH</key>
-					<string>/</string>
-					<key>PATH_TYPE</key>
-					<integer>0</integer>
-					<key>PERMISSIONS</key>
-					<integer>493</integer>
-					<key>TYPE</key>
-					<integer>1</integer>
-					<key>UID</key>
-					<integer>0</integer>
-				</dict>
-				<key>PAYLOAD_TYPE</key>
-				<integer>0</integer>
-				<key>PRESERVE_EXTENDED_ATTRIBUTES</key>
-				<false/>
-				<key>SHOW_INVISIBLE</key>
-				<false/>
-				<key>SPLIT_FORKS</key>
-				<true/>
-				<key>TREAT_MISSING_FILES_AS_WARNING</key>
-				<false/>
-				<key>VERSION</key>
-				<integer>5</integer>
-			</dict>
-			<key>PACKAGE_SCRIPTS</key>
-			<dict>
-				<key>POSTINSTALL_PATH</key>
-				<dict>
-					<key>PATH_TYPE</key>
-					<integer>0</integer>
-				</dict>
-				<key>PREINSTALL_PATH</key>
-				<dict>
-					<key>PATH_TYPE</key>
-					<integer>0</integer>
-				</dict>
-				<key>RESOURCES</key>
-				<array/>
-			</dict>
-			<key>PACKAGE_SETTINGS</key>
-			<dict>
-				<key>AUTHENTICATION</key>
-				<integer>0</integer>
-				<key>CONCLUSION_ACTION</key>
-				<integer>0</integer>
-				<key>FOLLOW_SYMBOLIC_LINKS</key>
-				<false/>
-				<key>IDENTIFIER</key>
-				<string>@MACOS_BUNDLEID@</string>
-				<key>LOCATION</key>
-				<integer>0</integer>
-				<key>NAME</key>
-				<string>@CMAKE_PROJECT_NAME@</string>
-				<key>OVERWRITE_PERMISSIONS</key>
-				<false/>
-				<key>PAYLOAD_SIZE</key>
-				<integer>-1</integer>
-				<key>REFERENCE_PATH</key>
-				<string></string>
-				<key>RELOCATABLE</key>
-				<false/>
-				<key>USE_HFS+_COMPRESSION</key>
-				<false/>
-				<key>VERSION</key>
-				<string>@CMAKE_PROJECT_VERSION@</string>
-			</dict>
-			<key>TYPE</key>
-			<integer>0</integer>
-			<key>UUID</key>
-			<string>0B7A74BC-65CF-4FF1-AC34-5C743E8A48F5</string>
-		</dict>
-	</array>
-	<key>PROJECT</key>
-	<dict>
-		<key>PROJECT_COMMENTS</key>
-		<dict>
-			<key>NOTES</key>
-			<data>
-			</data>
-		</dict>
-		<key>PROJECT_PRESENTATION</key>
-		<dict>
-			<key>BACKGROUND</key>
-			<dict>
-				<key>APPAREANCES</key>
-				<dict>
-					<key>DARK_AQUA</key>
-					<dict/>
-					<key>LIGHT_AQUA</key>
-					<dict/>
-				</dict>
-				<key>SHARED_SETTINGS_FOR_ALL_APPAREANCES</key>
-				<true/>
-			</dict>
-			<key>INSTALLATION TYPE</key>
-			<dict>
-				<key>HIERARCHIES</key>
-				<dict>
-					<key>INSTALLER</key>
-					<dict>
-						<key>LIST</key>
-						<array>
-							<dict>
-								<key>CHILDREN</key>
-								<array/>
-								<key>DESCRIPTION</key>
-								<array/>
-								<key>OPTIONS</key>
-								<dict>
-									<key>HIDDEN</key>
-									<false/>
-									<key>STATE</key>
-									<integer>1</integer>
-								</dict>
-								<key>PACKAGE_UUID</key>
-								<string>0B7A74BC-65CF-4FF1-AC34-5C743E8A48F5</string>
-								<key>TITLE</key>
-								<array/>
-								<key>TYPE</key>
-								<integer>0</integer>
-								<key>UUID</key>
-								<string>52B6084A-F58D-45C3-BE37-76AD45F16072</string>
-							</dict>
-						</array>
-						<key>REMOVED</key>
-						<dict/>
-					</dict>
-				</dict>
-				<key>MODE</key>
-				<integer>0</integer>
-			</dict>
-			<key>INSTALLATION_STEPS</key>
-			<array>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewIntroductionController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>Introduction</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewReadMeController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>ReadMe</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewLicenseController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>License</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewDestinationSelectController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>TargetSelect</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewInstallationTypeController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>PackageSelection</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewInstallationController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>Install</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewSummaryController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>Summary</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-			</array>
-			<key>INTRODUCTION</key>
-			<dict>
-				<key>LOCALIZATIONS</key>
-				<array/>
-			</dict>
-			<key>LICENSE</key>
-			<dict>
-				<key>LOCALIZATIONS</key>
-				<array/>
-				<key>MODE</key>
-				<integer>0</integer>
-			</dict>
-			<key>README</key>
-			<dict>
-				<key>LOCALIZATIONS</key>
-				<array/>
-			</dict>
-			<key>SUMMARY</key>
-			<dict>
-				<key>LOCALIZATIONS</key>
-				<array/>
-			</dict>
-			<key>TITLE</key>
-			<dict>
-				<key>LOCALIZATIONS</key>
-				<array/>
-			</dict>
-		</dict>
-		<key>PROJECT_REQUIREMENTS</key>
-		<dict>
-			<key>LIST</key>
-			<array>
-				<dict>
-					<key>BEHAVIOR</key>
-					<integer>3</integer>
-					<key>DICTIONARY</key>
-					<dict>
-						<key>IC_REQUIREMENT_FILES_CONDITION</key>
-						<integer>0</integer>
-						<key>IC_REQUIREMENT_FILES_DISK_TYPE</key>
-						<integer>0</integer>
-						<key>IC_REQUIREMENT_FILES_LIST</key>
-						<array>
-							<string>/Applications/OBS.app</string>
-						</array>
-						<key>IC_REQUIREMENT_FILES_SELECTOR</key>
-						<integer>0</integer>
-					</dict>
-					<key>IC_REQUIREMENT_CHECK_TYPE</key>
-					<integer>1</integer>
-					<key>IDENTIFIER</key>
-					<string>fr.whitebox.Packages.requirement.files</string>
-					<key>MESSAGE</key>
-					<array/>
-					<key>NAME</key>
-					<string>Files</string>
-					<key>STATE</key>
-					<true/>
-				</dict>
-				<dict>
-					<key>BEHAVIOR</key>
-					<integer>3</integer>
-					<key>DICTIONARY</key>
-					<dict>
-						<key>IC_REQUIREMENT_OS_DISK_TYPE</key>
-						<integer>1</integer>
-						<key>IC_REQUIREMENT_OS_DISTRIBUTION_TYPE</key>
-						<integer>0</integer>
-						<key>IC_REQUIREMENT_OS_MINIMUM_VERSION</key>
-						<integer>101300</integer>
-					</dict>
-					<key>IC_REQUIREMENT_CHECK_TYPE</key>
-					<integer>0</integer>
-					<key>IDENTIFIER</key>
-					<string>fr.whitebox.Packages.requirement.os</string>
-					<key>MESSAGE</key>
-					<array/>
-					<key>NAME</key>
-					<string>Operating System</string>
-					<key>STATE</key>
-					<true/>
-				</dict>
-			</array>
-			<key>RESOURCES</key>
-			<array/>
-			<key>ROOT_VOLUME_ONLY</key>
-			<true/>
-		</dict>
-		<key>PROJECT_SETTINGS</key>
-		<dict>
-			<key>ADVANCED_OPTIONS</key>
-			<dict>
-				<key>installer-script.domains:enable_currentUserHome</key>
-				<integer>1</integer>
-			</dict>
-			<key>BUILD_FORMAT</key>
-			<integer>0</integer>
-			<key>BUILD_PATH</key>
-			<dict>
-				<key>PATH</key>
-				<string>../@RELATIVE_BUILD_PATH@</string>
-				<key>PATH_TYPE</key>
-				<integer>1</integer>
-			</dict>
-			<key>EXCLUDED_FILES</key>
-			<array>
-				<dict>
-					<key>PATTERNS_ARRAY</key>
-					<array>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>.DS_Store</string>
-							<key>TYPE</key>
-							<integer>0</integer>
-						</dict>
-					</array>
-					<key>PROTECTED</key>
-					<true/>
-					<key>PROXY_NAME</key>
-					<string>Remove .DS_Store files</string>
-					<key>PROXY_TOOLTIP</key>
-					<string>Remove ".DS_Store" files created by the Finder.</string>
-					<key>STATE</key>
-					<true/>
-				</dict>
-				<dict>
-					<key>PATTERNS_ARRAY</key>
-					<array>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>.pbdevelopment</string>
-							<key>TYPE</key>
-							<integer>0</integer>
-						</dict>
-					</array>
-					<key>PROTECTED</key>
-					<true/>
-					<key>PROXY_NAME</key>
-					<string>Remove .pbdevelopment files</string>
-					<key>PROXY_TOOLTIP</key>
-					<string>Remove ".pbdevelopment" files created by ProjectBuilder or Xcode.</string>
-					<key>STATE</key>
-					<true/>
-				</dict>
-				<dict>
-					<key>PATTERNS_ARRAY</key>
-					<array>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>CVS</string>
-							<key>TYPE</key>
-							<integer>1</integer>
-						</dict>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>.cvsignore</string>
-							<key>TYPE</key>
-							<integer>0</integer>
-						</dict>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>.cvspass</string>
-							<key>TYPE</key>
-							<integer>0</integer>
-						</dict>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>.svn</string>
-							<key>TYPE</key>
-							<integer>1</integer>
-						</dict>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>.git</string>
-							<key>TYPE</key>
-							<integer>1</integer>
-						</dict>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>.gitignore</string>
-							<key>TYPE</key>
-							<integer>0</integer>
-						</dict>
-					</array>
-					<key>PROTECTED</key>
-					<true/>
-					<key>PROXY_NAME</key>
-					<string>Remove SCM metadata</string>
-					<key>PROXY_TOOLTIP</key>
-					<string>Remove helper files and folders used by the CVS, SVN or Git Source Code Management systems.</string>
-					<key>STATE</key>
-					<true/>
-				</dict>
-				<dict>
-					<key>PATTERNS_ARRAY</key>
-					<array>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>classes.nib</string>
-							<key>TYPE</key>
-							<integer>0</integer>
-						</dict>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>designable.db</string>
-							<key>TYPE</key>
-							<integer>0</integer>
-						</dict>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>info.nib</string>
-							<key>TYPE</key>
-							<integer>0</integer>
-						</dict>
-					</array>
-					<key>PROTECTED</key>
-					<true/>
-					<key>PROXY_NAME</key>
-					<string>Optimize nib files</string>
-					<key>PROXY_TOOLTIP</key>
-					<string>Remove "classes.nib", "info.nib" and "designable.nib" files within .nib bundles.</string>
-					<key>STATE</key>
-					<true/>
-				</dict>
-				<dict>
-					<key>PATTERNS_ARRAY</key>
-					<array>
-						<dict>
-							<key>REGULAR_EXPRESSION</key>
-							<false/>
-							<key>STRING</key>
-							<string>Resources Disabled</string>
-							<key>TYPE</key>
-							<integer>1</integer>
-						</dict>
-					</array>
-					<key>PROTECTED</key>
-					<true/>
-					<key>PROXY_NAME</key>
-					<string>Remove Resources Disabled folders</string>
-					<key>PROXY_TOOLTIP</key>
-					<string>Remove "Resources Disabled" folders.</string>
-					<key>STATE</key>
-					<true/>
-				</dict>
-				<dict>
-					<key>SEPARATOR</key>
-					<true/>
-				</dict>
-			</array>
-			<key>NAME</key>
-			<string>@CMAKE_PROJECT_NAME@</string>
-			<key>PAYLOAD_ONLY</key>
-			<false/>
-			<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>
-			<false/>
-		</dict>
-	</dict>
-	<key>TYPE</key>
-	<integer>0</integer>
-	<key>VERSION</key>
-	<integer>2</integer>
-</dict>
-</plist>
diff --git a/cmake/bundle/windows/installer-Windows.iss.in b/cmake/bundle/windows/installer-Windows.iss.in
index e8545fc..4cc709b 100644
--- a/cmake/bundle/windows/installer-Windows.iss.in
+++ b/cmake/bundle/windows/installer-Windows.iss.in
@@ -19,6 +19,7 @@ DefaultGroupName={#MyAppName}
 OutputBaseFilename={#MyAppName}-{#MyAppVersion}-Windows-Installer
 Compression=lzma
 SolidCompression=yes
+DirExistsWarning=no
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"