Bundle with Visual Studio 8 CRT by default

[idzebra-moved-to-github.git] / win / zebra.nsi

diff --git a/win/zebra.nsi b/win/zebra.nsi
index 5a246de..eb231ba 100644 (file)
--- a/win/zebra.nsi
+++ b/win/zebra.nsi
@@ -1,7 +1,14 @@
-; $Id: zebra.nsi,v 1.24 2004-08-25 09:21:43 adam Exp $
+; $Id: zebra.nsi,v 1.29 2006-06-07 11:20:03 adam Exp $
 
 !define VERSION "1.4.0"
 
+; Microsoft runtime CRT
+; VS 2003
+; !define VS_RUNTIME "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
+
+; VS 2005
+!define VS_RUNTIME "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll"
+
 !include "MUI.nsh"
 
 SetCompressor bzip2
@@ -70,11 +77,11 @@ Section "Zebra Runtime"
        SetOutPath $INSTDIR\bin
        File ..\bin\*.exe
        File ..\bin\iconv.dll
-       File ..\bin\zlib.dll
+       File ..\bin\zlib1.dll
        File ..\bin\libxml2.dll
        File ..\bin\yaz.dll
        File ..\bin\libexpat.dll
-       File c:\winnt\system32\msvcr71.dll
+       File "${VS_RUNTIME}"
 SectionEnd
 
 Section "Zebra Development"
@@ -92,15 +99,12 @@ Section "Zebra Documentation"
        SetOutPath $INSTDIR\doc
        File ..\doc\*.html
        File ..\doc\*.png
-       File ..\doc\*.pdf
        File ..\doc\*.xml
        File ..\doc\*.in
        File ..\doc\*.xsl
        SetOutPath "$SMPROGRAMS\Index Data\Zebra\"
        CreateShortCut "$SMPROGRAMS\Index Data\Zebra\HTML Documentation.lnk" \
-                 "$INSTDIR\doc\zebra.html"
-       CreateShortCut "$SMPROGRAMS\Index Data\Zebra\PDF Documentaion.lnk" \
-                 "$INSTDIR\doc\zebra.pdf"
+                 "$INSTDIR\doc\index.html"
 SectionEnd
 
 Section "Zebra Examples"
@@ -136,6 +140,7 @@ Section "Zebra Source"
        File ..\recctrl\*.h
        SetOutPath $INSTDIR\dict
        File ..\dict\*.c
+       File ..\dict\*.h
        SetOutPath $INSTDIR\bfile
        File ..\bfile\*.c
        File ..\bfile\*.h