X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fzebra.nsi;h=f20b718d5f0ef3141fab17c74bd478bcc02faf30;hb=ca8ea9b7dfba1b20033345d996ade40d1e94159b;hp=f4d26748cee8aefcc8448affab00e0a5e718e9f3;hpb=d513d15e315601b730b0b3a6126c3163d00223fb;p=idzebra-moved-to-github.git

diff --git a/win/zebra.nsi b/win/zebra.nsi
index f4d2674..f20b718 100644
--- a/win/zebra.nsi
+++ b/win/zebra.nsi
@@ -1,6 +1,6 @@
 !include version.nsi
 
-; Microsoft runtime CRT 
+; Microsoft runtime CRT
 ; Uncomment exactly ONE of the sections below
 ; 1: MSVC 6
 ; !define VS_RUNTIME_DLL ""
@@ -8,15 +8,19 @@
 
 ; 2: VS 2003
 ; !define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
-;!define VS_RUNTIME_MANIFEST ""
+; !define VS_RUNTIME_MANIFEST ""
 
 ; 3: VS 2005
-;!define VS_RUNTIME_DLL      "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll"
-;!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest"
+; !define VS_RUNTIME_DLL      "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll"
+; !define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest"
 
 ; 4: VS 2008
-!define VS_RUNTIME_DLL      "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvc*90.dll"
-!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"
+; !define VS_RUNTIME_DLL      "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvc*90.dll"
+; !define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"
+
+; 5: VS 2013
+!define VS_RUNTIME_DLL      "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\msvc*.dll"
+!define VS_RUNTIME_MANIFEST  ""
 
 !include "MUI.nsh"
 
@@ -85,11 +89,11 @@ Section "Zebra Runtime"
 	SectionIn 1 2
 	SetOutPath $INSTDIR\bin
 	File "${VS_RUNTIME_DLL}"
+!if "${VS_RUNTIME_MANIFEST}" != ""
 	File "${VS_RUNTIME_MANIFEST}"
+!endif
 	File ..\bin\*.exe
 	File ..\bin\idzebra.dll
-	File ..\bin\iconv.dll
-	File ..\bin\zlib1.dll
 	File ..\bin\libxml2.dll
 	File ..\bin\libxslt.dll
 	File ..\bin\yaz*.dll
@@ -110,7 +114,7 @@ SectionEnd
 Section "Zebra Documentation"
 	SectionIn 1 2
 	SetOutPath $INSTDIR\doc
-	File /r ..\doc\*.html
+	File /nonfatal /r ..\doc\*.html
 	File /r ..\doc\*.png
 	File /r ..\doc\*.xml
 	File /r ..\doc\*.xsl