0
0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 04:42:18 +02:00

CI: Update macOS and Windows build scripts for OAuth configs via preset

Also sets GPU_PRIORITY_VAL via preset on Windows.
This commit is contained in:
PatTheMav 2023-07-06 02:04:33 +02:00 committed by Patrick Heyer
parent bda58bfb8e
commit 9712b33417
2 changed files with 0 additions and 42 deletions

View File

@ -62,36 +62,6 @@ function Build {
$CmakeBuildArgs = @('--build')
$CmakeInstallArgs = @()
if ( ( $env:TWITCH_CLIENTID -ne '' ) -and ( $env:TWITCH_HASH -ne '' ) ) {
$CmakeArgs += @(
"-DTWITCH_CLIENTID:STRING=${env:TWITCH_CLIENTID}"
"-DTWITCH_HASH:STRING=${env:TWITCH_HASH}"
)
}
if ( ( $env:RESTREAM_CLIENTID -ne '' ) -and ( $env:RESTREAM_HASH -ne '' ) ) {
$CmakeArgs += @(
"-DRESTREAM_CLIENTID:STRING=${env:RESTREAM_CLIENTID}"
"-DRESTREAM_HASH:STRING=${env:RESTREAM_HASH}"
)
}
if ( ( $env:YOUTUBE_CLIENTID -ne '' ) -and ( $env:YOUTUBE_CLIENTID_HASH -ne '' ) -and
( $env:YOUTUBE_SECRET -ne '' ) -and ( $env:YOUTUBE_SECRET_HASH-ne '' ) ) {
$CmakeArgs += @(
"-DYOUTUBE_CLIENTID:STRING=${env:YOUTUBE_CLIENTID}"
"-DYOUTUBE_CLIENTID_HASH:STRING=${env:YOUTUBE_CLIENTID_HASH}"
"-DYOUTUBE_SECRET:STRING=${env:YOUTUBE_SECRET}"
"-DYOUTUBE_SECRET_HASH:STRING=${env:YOUTUBE_SECRET_HASH}"
)
}
if ( $env:GPU_PRIORITY_VAL -ne '' ) {
$CmakeArgs += @(
"-DGPU_PRIORITY_VAL:STRING=${env:GPU_PRIORITY_VAL}"
)
}
if ( ( $env:CI -ne $null ) -and ( $env:CCACHE_CONFIGPATH -ne $null ) ) {
$CmakeArgs += @(
"-DENABLE_CCACHE:BOOL=TRUE"

View File

@ -68,18 +68,6 @@ _configure_obs() {
trap "caught_error 'configure build'" ERR
check_ccache
if [ "${TWITCH_CLIENTID}" -a "${TWITCH_HASH}" ]; then
TWITCH_OPTIONS="-DTWITCH_CLIENTID='${TWITCH_CLIENTID}' -DTWITCH_HASH='${TWITCH_HASH}'"
fi
if [ "${RESTREAM_CLIENTID}" -a "${RESTREAM_HASH}" ]; then
RESTREAM_OPTIONS="-DRESTREAM_CLIENTID='${RESTREAM_CLIENTID}' -DRESTREAM_HASH='${RESTREAM_HASH}'"
fi
if [ "${YOUTUBE_CLIENTID}" -a "${YOUTUBE_CLIENTID_HASH}" -a "${YOUTUBE_SECRET}" -a "{YOUTUBE_SECRET_HASH}" ]; then
YOUTUBE_OPTIONS="-DYOUTUBE_CLIENTID='${YOUTUBE_CLIENTID}' -DYOUTUBE_CLIENTID_HASH='${YOUTUBE_CLIENTID_HASH}' -DYOUTUBE_SECRET='${YOUTUBE_SECRET}' -DYOUTUBE_SECRET_HASH='${YOUTUBE_SECRET_HASH}'"
fi
if [ "${SPARKLE_APPCAST_URL}" -a "${SPARKLE_PUBLIC_KEY}" ]; then
SPARKLE_OPTIONS="-DSPARKLE_APPCAST_URL=\"${SPARKLE_APPCAST_URL}\" -DSPARKLE_PUBLIC_KEY=\"${SPARKLE_PUBLIC_KEY}\""
fi