Enable compile time option for Mapbox access token.

[andy/viking.git] / win32 / installer.bat

diff --git a/win32/installer.bat b/win32/installer.bat
index 44b8dab490f00f6c7b1112c7456da510e0eb0915..9df95e03af8c4dbf077b94b30884b3288be26a9a 100644 (file)
--- a/win32/installer.bat
+++ b/win32/installer.bat
@@ -96,6 +96,13 @@ if exist "%LIBSQL3%" (
        echo Required %LIBSQL3% does not exist\r
        goto Tidy\r
 )\r
+set LIBZIP=%MINGW_BIN%\libzip.dll\r
+if exist "%LIBZIP%" (\r
+       %MYCOPY% "%LIBZIP%" %DESTINATION%\r
+) else (\r
+       echo Required %LIBZIP% does not exist\r
+       goto Tidy\r
+)\r
 \r
 :: TODO Maybe embed http://gtk-win.sourceforge.net/home/index.php/Main/EmbeddingGTK directly in NSIS?\r
 :: Best to use the same GTK version as we built against in prepare.bat!!\r
@@ -122,7 +129,7 @@ cache\%GTK_RUNTIME% /sideeffects=no /setpath=no /dllpath=root /translations=no /
 \r
 echo Copying GPSBabel Installer
 mkdir %DESTINATION%\Optional
-%MYCOPY% cache\GPSBabel-1.5.1-Setup.exe %DESTINATION%\Optional
+%MYCOPY% cache\GPSBabel-1.5.2-Setup.exe %DESTINATION%\Optional
 if ERRORLEVEL 1 goto Error
 
 ::\r
@@ -133,7 +140,7 @@ if ERRORLEVEL 1 goto Error
 echo Running NSIS (command line version)\r
 pushd installer\r
 if exist "%ProgramFiles%\NSIS" (\r
-       "%ProgramFiles%\NSIS\makensis.exe" viking-installer.nsi\r
+       "%ProgramFiles%\NSIS\makensis.exe" /X"SetCompressor /SOLID lzma" viking-installer.nsi\r
 ) else (\r
        echo NSIS Not installed in known location\r
 )\r