AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-23 03:47:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'openal48' into 'openmw-48'

Browse Source 
!2748 for 0.48

See merge request OpenMW/openmw!2772
This commit is contained in:
psi29a 2023-02-26 20:59:19 +00:00
commit 15236faf03
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CI/before_script.msvc.sh
View File

@ -612,9 +612,9 @@ if [ -z $SKIP_DOWNLOAD ]; then
fi fi
# OpenAL # OpenAL
download "OpenAL-Soft 1.20.1" \ download "OpenAL-Soft 1.23.0" \
"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/OpenAL-Soft-1.20.1.zip" \ "https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/OpenAL-Soft-1.23.0.zip" \
"OpenAL-Soft-1.20.1.zip" "OpenAL-Soft-1.23.0.zip"
# OSGoS # OSGoS
download "${OSG_ARCHIVE_NAME}" \ download "${OSG_ARCHIVE_NAME}" \
@ -803,19 +803,19 @@ printf "MyGUI 3.4.1... "
cd $DEPS cd $DEPS
echo echo
# OpenAL # OpenAL
printf "OpenAL-Soft 1.20.1... " printf "OpenAL-Soft 1.23.0... "
{ {
if [ -d openal-soft-1.20.1-bin ]; then if [ -d openal-soft-1.23.0-bin ]; then
printf "Exists. " printf "Exists. "
elif [ -z $SKIP_EXTRACT ]; then elif [ -z $SKIP_EXTRACT ]; then
rm -rf openal-soft-1.20.1-bin rm -rf openal-soft-1.23.0-bin
eval 7z x -y OpenAL-Soft-1.20.1.zip $STRIP eval 7z x -y OpenAL-Soft-1.23.0.zip $STRIP
fi fi
OPENAL_SDK="$(real_pwd)/openal-soft-1.20.1-bin" OPENAL_SDK="$(real_pwd)/openal-soft-1.23.0-bin"
add_cmake_opts -DOPENAL_INCLUDE_DIR="${OPENAL_SDK}/include/AL" \ add_cmake_opts -DOPENAL_INCLUDE_DIR="${OPENAL_SDK}/include/AL" \
-DOPENAL_LIBRARY="${OPENAL_SDK}/libs/Win${BITS}/OpenAL32.lib" -DOPENAL_LIBRARY="${OPENAL_SDK}/libs/Win${BITS}/OpenAL32.lib"
for config in ${CONFIGURATIONS[@]}; do for config in ${CONFIGURATIONS[@]}; do
add_runtime_dlls $config "$(pwd)/openal-soft-1.20.1-bin/bin/WIN${BITS}/soft_oal.dll:OpenAL32.dll" add_runtime_dlls $config "$(pwd)/openal-soft-1.23.0-bin/bin/WIN${BITS}/soft_oal.dll:OpenAL32.dll"
done done
echo Done. echo Done.
} }