Merge pull request #7479 from Mailaender/nuget-openal-soft
Replaced OpenAL Soft Windows DLL with a fetch script from Nuget
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -41,6 +41,7 @@ thirdparty/Mono.Nat.dll
|
|||||||
thirdparty/nuget.exe
|
thirdparty/nuget.exe
|
||||||
thirdparty/windows/lua51.dll
|
thirdparty/windows/lua51.dll
|
||||||
thirdparty/windows/zlib1.dll
|
thirdparty/windows/zlib1.dll
|
||||||
|
thirdparty/windows/soft_oal.dll
|
||||||
|
|
||||||
# backup files by various editors
|
# backup files by various editors
|
||||||
*~
|
*~
|
||||||
|
|||||||
10
thirdparty/fetch-thirdparty-deps-windows.sh
vendored
10
thirdparty/fetch-thirdparty-deps-windows.sh
vendored
@@ -3,6 +3,10 @@
|
|||||||
# Die on any error for Travis CI to automatically retry:
|
# Die on any error for Travis CI to automatically retry:
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
if [ ! -d windows ]; then
|
||||||
|
mkdir windows
|
||||||
|
fi
|
||||||
|
|
||||||
if [ ! -f windows/SDL2.dll ]; then
|
if [ ! -f windows/SDL2.dll ]; then
|
||||||
echo "Fetching SDL2 from nuget"
|
echo "Fetching SDL2 from nuget"
|
||||||
nuget install sdl2 -Version 2.0.3
|
nuget install sdl2 -Version 2.0.3
|
||||||
@@ -31,3 +35,9 @@ if [ ! -f windows/zlib1.dll ]; then
|
|||||||
rm -rf zlib.redist.1.2.8.7
|
rm -rf zlib.redist.1.2.8.7
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ ! -f windows/soft_oal.dll ]; then
|
||||||
|
echo "Fetching OpenAL Soft from nuget"
|
||||||
|
nuget install OpenAL-Soft -Version 1.16.0
|
||||||
|
cp ./OpenAL-Soft.1.16.0/bin/Win32/soft_oal.dll windows/soft_oal.dll
|
||||||
|
rm -rf OpenAL-Soft.1.16.0
|
||||||
|
fi
|
||||||
|
|||||||
8
thirdparty/fetch-thirdparty-deps.ps1
vendored
8
thirdparty/fetch-thirdparty-deps.ps1
vendored
@@ -97,3 +97,11 @@ if (!(Test-Path "windows/zlib1.dll"))
|
|||||||
cp zlib.redist.1.2.8.7/build/native/bin/v120/Win32/Release/dynamic/stdcall/zlib.dll windows/zlib1.dll
|
cp zlib.redist.1.2.8.7/build/native/bin/v120/Win32/Release/dynamic/stdcall/zlib.dll windows/zlib1.dll
|
||||||
rmdir zlib.redist.1.2.8.7 -Recurse
|
rmdir zlib.redist.1.2.8.7 -Recurse
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!(Test-Path "windows/soft_oal.dll"))
|
||||||
|
{
|
||||||
|
echo "Fetching OpenAL Soft from NuGet."
|
||||||
|
./nuget.exe install OpenAL-Soft -Version 1.16.0
|
||||||
|
cp OpenAL-Soft.1.16.0/bin/Win32/soft_oal.dll windows/soft_oal.dll
|
||||||
|
rmdir OpenAL-Soft.1.16.0 -Recurse
|
||||||
|
}
|
||||||
|
|||||||
BIN
thirdparty/windows/soft_oal.dll
vendored
BIN
thirdparty/windows/soft_oal.dll
vendored
Binary file not shown.
Reference in New Issue
Block a user