X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/229ff69dba0bca249940f1cdb17beab1126ad04e..02468bf10a1db541843fb089135585ea4fdcd4e2:/win32/prepare.bat

diff --git a/win32/prepare.bat b/win32/prepare.bat
index 41bfdfd5..7c773447 100644
--- a/win32/prepare.bat
+++ b/win32/prepare.bat
@@ -30,7 +30,7 @@ if not exist "%ProgramFiles%\7-Zip\7z.exe" (
 	%ZIP_INST% /S
 	if ERRORLEVEL 1 goto Error
 )
-
+
 echo =+=+=
 echo Checking mingw...
 echo =+=+=
@@ -463,10 +463,35 @@ if not exist "%MINGW_BIN%\iconv.dll" (
 	rmdir /Q /S %ICONV%
 )
 
+
+echo =+=+=
+echo Checking libzip...
+echo =+=+=
+REM Originally planned to extract from an existing MINGW32 RPM,
+REM  which worked OK to compile+link but Viking did not run up after install
+REM I think the dll is linked to a different gcc runtime
+set LIBZIP=mingw32-libzip-1.0.1-3
+set LIBZIP_RPM=mingw32-libzip-1.0.1-3.fc24.noarch.rpm
+if not exist "%MINGW_BIN%\libzip.dll" (
+	echo MANUALLY NEED TO ACQUIRE AND INSTALL LIBZIP
+	EXIT
+REM 	Instead build libzip from source
+REM 	http://www.nih.at/libzip/ - download latest source (31d625ae55b5 on 16/11/15)
+REM 	Use CMake (v3.4.0) on Windows
+REM 	wine cmd
+REM 	set CC=gcc
+REM 	set PATH=%PATH%;%SystemDrive%\Mingw\bin
+REM 	cmake -DCMAKE_C_COMPILER:FILEPATH='gcc' -G "MSYS Makefiles" .
+REM 	set PATH=%PATH%;%SystemDrive%\msys\1.0\bin
+REM 	make
+REM 	(needed to fix zipint.h to include limits.h for a successful compile)
+REM 	Copy libzip.dll.a,libzip.dll,zip.h+zipconf.h to appropraite places.
+)
+
 :: 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.5.1-Setup.exe
+set GPSBABEL_INST=GPSBabel-1.5.2-Setup.exe
 if not exist %GPSBABEL_INST% (
 	echo Required %GPSBABEL_INST% not found. Exitting
 	exit /b