diff --git a/.gitignore b/.gitignore index 571361d543..c00716c1f0 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ thirdparty/windows/SDL2.dll thirdparty/Mono.Nat.dll thirdparty/nuget.exe thirdparty/windows/lua51.dll +thirdparty/windows/zlib1.dll # backup files by various editors *~ diff --git a/thirdparty/fetch-thirdparty-deps-windows.sh b/thirdparty/fetch-thirdparty-deps-windows.sh index e34339c7cd..a379b9973a 100755 --- a/thirdparty/fetch-thirdparty-deps-windows.sh +++ b/thirdparty/fetch-thirdparty-deps-windows.sh @@ -24,3 +24,10 @@ if [ ! -f windows/lua51.dll ]; then rm -rf lua51.redist.5.1.5 fi +if [ ! -f windows/zlib1.dll ]; then + echo "Fetching ZLib from nuget" + nuget install zlib.redist -Version 1.2.8.7 + cp ./zlib.redist.1.2.8.7/build/native/bin/v120/Win32/Release/dynamic/stdcall/zlib.dll windows/zlib1.dll + rm -rf zlib.redist.1.2.8.7 +fi + diff --git a/thirdparty/fetch-thirdparty-deps.ps1 b/thirdparty/fetch-thirdparty-deps.ps1 index 49fb7ee931..9779326617 100644 --- a/thirdparty/fetch-thirdparty-deps.ps1 +++ b/thirdparty/fetch-thirdparty-deps.ps1 @@ -79,3 +79,11 @@ if (!(Test-Path "windows/lua51.dll")) cp lua51.redist.5.1.5/build/native/bin/Win32/v120/Release/lua5.1.dll ./windows/lua51.dll rmdir lua51.redist.5.1.5 -Recurse } + +if (!(Test-Path "windows/zlib1.dll")) +{ + echo "Fetching ZLib from NuGet." + ./nuget.exe install zlib.redist -Version 1.2.8.7 + 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 +} diff --git a/thirdparty/windows/zlib1.dll b/thirdparty/windows/zlib1.dll deleted file mode 100644 index 775aaf1f2c..0000000000 Binary files a/thirdparty/windows/zlib1.dll and /dev/null differ