X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=win%2Fzebra.nsi;h=926b29541f1131c52ce3ce4c2868519402b696fb;hb=80786c0d2f702ba5d45ee249af1c194e341eeb45;hp=dc10794a99be124870a05a0789cbe7c1092552e8;hpb=cb61a1ed1e4fc3d47fe09ba5c7fb10ddfd3e6aaf;p=idzebra-moved-to-github.git

diff --git a/win/zebra.nsi b/win/zebra.nsi
index dc10794..926b295 100644
--- a/win/zebra.nsi
+++ b/win/zebra.nsi
@@ -1,14 +1,26 @@
-!define VERSION "2.0.34"
+!include version.nsi
 
-; VS 2005
+; Microsoft runtime CRT
+; Uncomment exactly ONE of the sections below
+; 1: MSVC 6
+; !define VS_RUNTIME_DLL ""
+; !define VS_RUNTIME_MANIFEST ""
+
+; 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 ""
+
+; 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"
 
-; VS 2003
-; !define VS_RUNTIME_DLL "c:\Program files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
+; 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"
 
-; VS 6.0
-; (no defines)
+; 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"
 
@@ -76,12 +88,9 @@ SectionEnd ; end of default section
 Section "Zebra Runtime"
 	SectionIn 1 2
 	SetOutPath $INSTDIR\bin
-!ifdef VS_RUNTIME_DLL
 	File "${VS_RUNTIME_DLL}"
-!endif
-!ifdef VS_RUNTIME_MANIFEST
+!if "${VS_RUNTIME_MANIFEST}" != ""
 	File "${VS_RUNTIME_MANIFEST}"
-	File ..\bin\*.manifest
 !endif
 	File ..\bin\*.exe
 	File ..\bin\idzebra.dll
@@ -89,10 +98,9 @@ Section "Zebra Runtime"
 	File ..\bin\zlib1.dll
 	File ..\bin\libxml2.dll
 	File ..\bin\libxslt.dll
-	File ..\bin\yaz3.dll
-	File ..\bin\libexpat.dll
+	File ..\bin\yaz*.dll
 	File ..\bin\icu*.dll
-	File ..\bin\yaz_icu3.dll
+	File ..\bin\libexpat.dll
 SectionEnd
 
 Section "Zebra Development"
@@ -128,8 +136,11 @@ SectionEnd
 
 Section "Zebra Source"
 	SectionIn 1
+	SetOutPath $INSTDIR
+	File ..\IDMETA
 	SetOutPath $INSTDIR\util
 	File ..\util\*.c
+	File ..\util\*.tcl
 	SetOutPath $INSTDIR\dfa
 	File ..\dfa\*.c
 	File ..\dfa\*.h