Make generation of the copyright year in the code automatic.

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

diff --git a/win32/prepare.bat b/win32/prepare.bat
index 41bfdfd5d735a4157e4843eeaf8de9d8dacfca66..7c773447f80ccab0ceae1f7442dc8806b09f5047 100644 (file)
--- 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
 )
        %ZIP_INST% /S
        if ERRORLEVEL 1 goto Error
 )

-
+\r

 echo =+=+=\r
 echo Checking mingw...\r
 echo =+=+=\r
 echo =+=+=\r
 echo Checking mingw...\r
 echo =+=+=\r


@@ -463,10 +463,35 @@ if not exist "%MINGW_BIN%\iconv.dll" (
        rmdir /Q /S %ICONV%\r
 )\r
 \r
        rmdir /Q /S %ICONV%\r
 )\r
 \r

+\r
+echo =+=+=\r
+echo Checking libzip...\r
+echo =+=+=\r
+REM Originally planned to extract from an existing MINGW32 RPM,\r
+REM  which worked OK to compile+link but Viking did not run up after install\r
+REM I think the dll is linked to a different gcc runtime\r
+set LIBZIP=mingw32-libzip-1.0.1-3\r
+set LIBZIP_RPM=mingw32-libzip-1.0.1-3.fc24.noarch.rpm\r
+if not exist "%MINGW_BIN%\libzip.dll" (\r
+       echo MANUALLY NEED TO ACQUIRE AND INSTALL LIBZIP\r
+       EXIT\r
+REM    Instead build libzip from source\r
+REM    http://www.nih.at/libzip/ - download latest source (31d625ae55b5 on 16/11/15)\r
+REM    Use CMake (v3.4.0) on Windows\r
+REM    wine cmd\r
+REM    set CC=gcc\r
+REM    set PATH=%PATH%;%SystemDrive%\Mingw\bin\r
+REM    cmake -DCMAKE_C_COMPILER:FILEPATH='gcc' -G "MSYS Makefiles" .\r
+REM    set PATH=%PATH%;%SystemDrive%\msys\1.0\bin\r
+REM    make\r
+REM    (needed to fix zipint.h to include limits.h for a successful compile)\r
+REM    Copy libzip.dll.a,libzip.dll,zip.h+zipconf.h to appropraite places.\r
+)\r
+\r

 :: Note GPSBabel can not be directly downloaded via wget\r
 :: ATM get it manually from here:\r
 ::   http://www.gpsbabel.org/download.html\r
 :: Note GPSBabel can not be directly downloaded via wget\r
 :: ATM get it manually from here:\r
 ::   http://www.gpsbabel.org/download.html\r

-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
 if not exist %GPSBABEL_INST% (
        echo Required %GPSBABEL_INST% not found. Exitting
        exit /b