epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10599 from Mailaender/sdl-2.0.4

Browse Source 
Updated to SDL 2.0.4 for Windows
This commit is contained in:
RoosterDragon
2016-02-24 19:07:51 +00:00
parent 85ee351d96 e11afaf55b
commit c63d71b95d
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
thirdparty/fetch-thirdparty-deps-windows.sh vendored
View File

@@ -18,10 +18,10 @@ function get()
} }
if [ ! -f SDL2.dll ]; then if [ ! -f SDL2.dll ]; then
echo "Fetching SDL2 from NuGet" echo "Fetching SDL2 from libsdl.org"
get sdl2.redist 2.0.3 wget https://www.libsdl.org/release/SDL2-2.0.4-win32-x86.zip
cp ./sdl2.redist/build/native/bin/Win32/dynamic/SDL2.dll . unzip SDL2-2.0.4-win32-x86.zip SDL2.dll
rm -rf sdl2.redist rm SDL2-2.0.4-win32-x86.zip
fi fi
if [ ! -f freetype6.dll ]; then if [ ! -f freetype6.dll ]; then

12
thirdparty/fetch-thirdparty-deps.ps1 vendored
View File

@@ -69,11 +69,13 @@ if (!(Test-Path "nunit.framework.dll"))
if (!(Test-Path "windows/SDL2.dll")) if (!(Test-Path "windows/SDL2.dll"))
{ {
echo "Fetching SDL2 from NuGet." echo "Fetching SDL2 from libsdl.org"
./nuget.exe install sdl2 -Version 2.0.3 -ExcludeVersion $target = Join-Path $pwd.ToString() "SDL2-2.0.4-win32-x86.zip"
cp sdl2.redist/build/native/bin/Win32/dynamic/SDL2.dll ./windows/ (New-Object System.Net.WebClient).DownloadFile("https://www.libsdl.org/release/SDL2-2.0.4-win32-x86.zip", $target)
rmdir sdl2 -Recurse $destination = Join-Path $pwd.ToString() "windows"
rmdir sdl2.redist -Recurse Add-Type -assembly "system.io.compression.filesystem"
[io.compression.zipfile]::ExtractToDirectory($target, $destination)
rm SDL2-2.0.4-win32-x86.zip
} }
if (!(Test-Path "Mono.Nat.dll")) if (!(Test-Path "Mono.Nat.dll"))