X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/5f12fb6ad83608ba04d591b0ee3f8184eb175b4c..f570ee2bc0dac52b9bba9a193b7ba48e64f797ed:/win32/prepare.bat

diff --git a/win32/prepare.bat b/win32/prepare.bat
index cc5ec60b..602096bc 100644
--- a/win32/prepare.bat
+++ b/win32/prepare.bat
@@ -229,25 +229,20 @@ if not exist "%MINGW_BIN%\xgettext.exe" (
 echo =+=+=
 echo Checking libcurl...
 echo =+=+=
-set CURL_TAR=libcurl-7.14.0_nossl-1sid.tar
-set CURL_BZ2=%CURL_TAR%.bz2
+REM Win32 - Generic - http://curl.haxx.se/download.html
+set CURL=curl-7.34.0-devel-mingw32
+set CURL_ZIP=%CURL%.zip
 if not exist "%MINGW_BIN%\libcurl.dll" (
-	if not exist %CURL_BZ2% (
-		wget http://downloads.sourceforge.net/devpaks/libcurl-7.14.0_nossl-1sid.DevPak?download
-		move libcurl-7.14.0_nossl-1sid.DevPak %CURL_BZ2%
-	)
+	call :Download %CURL_ZIP% http://curl.haxx.se/gknw.net/7.34.0/dist-w32/%CURL_ZIP%
 	echo Extracting libcurl...
-	7z e %CURL_BZ2%
-	7z x %CURL_TAR% -o"libcurl"
+	7z x -y %CURL_ZIP% -o"libcurl"
 	if ERRORLEVEL 1 goto Error
 	@echo ON
-	move libcurl\include "%MinGW%\include\curl
-	copy /Y libcurl\bin\*.* "%MinGW_BIN%"
-	copy /Y libcurl\lib\*.* "%MinGW%\lib"
-	copy /Y libcurl\docs\*.* "%MinGW%\doc"
-	copy /Y COPYING.txt "%MinGW%\COPYING_curl.txt"
+	xcopy /S /Y libcurl\%CURL%\include\*.* "%MinGW%\include"
+	xcopy /S /Y libcurl\%CURL%\bin\*.* "%MinGW_BIN%"
+	xcopy /S /Y libcurl\%CURL%\lib\*.a "%MinGW%\lib"
+	copy /Y libcurl\%CURL%\COPYING "%MinGW%\COPYING_curl.txt"
 	rmdir /S /Q libcurl
-	del %CURL_TAR%
 	@echo OFF
 )
 
@@ -423,16 +418,10 @@ if not exist "%MINGW_BIN%\iconv.dll" (
 :: Note GPSBabel can not be directly downloaded via wget
 :: ATM get it manually from here:
 ::   http://www.gpsbabel.org/download.html
-set GPSBABEL_INST=GPSBabel-1.4.4-Setup.exe
-if not exist "%ProgramFiles%\GPSBabel" (
-	echo Installing GPSBabel...
-	if exist %GPSBABEL_INST% (
-		%GPSBABEL_INST% /silent
-		if ERRORLEVEL 1 goto Error
-	) else (
-		echo Required %GPSBABEL_INST% not found. Exitting
-		exit /b
-	)
+set GPSBABEL_INST=GPSBabel-1.5.1-Setup.exe
+if not exist %GPSBABEL_INST% (
+	echo Required %GPSBABEL_INST% not found. Exitting
+	exit /b
 )
 
 echo =+=+=