mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 20:45:34 +00:00
Code Issues Releases Wiki Activity

Merge branch 'osg_win_dep_48' into 'openmw-48'

Browse source 
Use most recent OSG dependency to match 0.48 RC builds (0.48)

See merge request OpenMW/openmw!3121
This commit is contained in:
psi29a 2023-06-10 12:37:41 +00:00
commit 00831a80fb
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -440,7 +440,7 @@ macOS12_Xcode13:
after_script:
- Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
cache:
key: ninja-v4
key: ninja-v0.48.5
paths:
- ccache
- deps
@ -541,7 +541,7 @@ macOS12_Xcode13:
after_script:
- Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
cache:
key: msbuild-v4
key: msbuild-v0.48.5
paths:
- ccache
- deps

2
CI/before_script.msvc.sh
View file

@ -556,7 +556,7 @@ fi
ICU_VER="70_1"
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"