From a4c69f0a7469dc99770ad052cb27764bb3b6fa74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 13 May 2013 23:06:47 +0200 Subject: [PATCH] try pulling OpenAL and SDL Windows libraries from mirrors --- packaging/windows/OpenRA.nsi | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi index d1050c8346..744a81fbf4 100644 --- a/packaging/windows/OpenRA.nsi +++ b/packaging/windows/OpenRA.nsi @@ -160,17 +160,14 @@ SectionGroupEnd ;*************************** Section "-OpenAl" OpenAl AddSize 768 + SetOutPath "$TEMP" ClearErrors ${GetFileVersion} $SYSDIR\OpenAL32.dll $0 IfErrors installal 0 ${VersionCompare} $0 "6.14.357.24" $1 IntCmp $1 1 done done installal installal: - SetOutPath "$TEMP" - NSISdl::download http://connect.creativelabs.com/openal/Downloads/oalinst.zip oalinst.zip - Pop $R0 - StrCmp $R0 "success" +2 - Abort + !insertmacro DownloadDependency "openal" "oalinst.zip" !insertmacro ZIPDLL_EXTRACT oalinst.zip OpenAL oalinst.exe ExecWait "$TEMP\OpenAL\oalinst.exe" done: @@ -178,10 +175,10 @@ SectionEnd Section "-Sdl" SDL AddSize 317 + SetOutPath "$TEMP" IfFileExists $INSTDIR\SDL.dll done installsdl installsdl: - SetOutPath "$TEMP" - NSISdl::download http://www.libsdl.org/release/SDL-1.2.14-win32.zip sdl.zip + !insertmacro DownloadDependency "sdl" "sdl.zip" !insertmacro ZIPDLL_EXTRACT sdl.zip $INSTDIR SDL.dll done: SectionEnd