1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-01 03:21:41 +00:00

Merge branch 'osg_win_dep' into 'master'

Use most recent OSG dependency to match 0.48 RC builds

See merge request OpenMW/openmw!3120
This commit is contained in:
psi29a 2023-06-10 08:54:31 +00:00
commit b62b5f363e
2 changed files with 3 additions and 3 deletions

View File

@ -570,7 +570,7 @@ macOS13_Xcode14_arm64:
- Get-Volume
- Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
cache:
key: ninja-v6
key: ninja-v7
paths:
- ccache
- deps
@ -679,7 +679,7 @@ macOS13_Xcode14_arm64:
- Get-Volume
- Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
cache:
key: msbuild-v6
key: msbuild-v7
paths:
- ccache
- deps

View File

@ -562,7 +562,7 @@ OPENAL_VER="1.23.0"
QT_VER="5.15.2"
OSG_ARCHIVE_NAME="OSGoS 3.6.5"
OSG_ARCHIVE="OSGoS-3.6.5-dd803bc-msvc${OSG_MSVC_YEAR}-win${BITS}"
OSG_ARCHIVE="OSGoS-3.6.5-123-g68c5c573d-msvc${OSG_MSVC_YEAR}-win${BITS}"
OSG_ARCHIVE_REPO_URL="https://gitlab.com/OpenMW/openmw-deps/-/raw/main"
if ! [ -z $OSG_MULTIVIEW_BUILD ]; then
OSG_ARCHIVE_NAME="OSG-3.6-multiview"