X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fzebra.nsi;h=d805e7c3ff71509bd065f613775c25b0b5c35f38;hb=c2e359c6fa974e7685e5b8bbde291f863d457150;hp=f402683244e428705285e55e2722a9974eaedf4b;hpb=4fd652ea50465c7f90803ddedb7cea37893e372f;p=idzebra-moved-to-github.git

diff --git a/win/zebra.nsi b/win/zebra.nsi
index f402683..d805e7c 100644
--- a/win/zebra.nsi
+++ b/win/zebra.nsi
@@ -1,13 +1,14 @@
-; $Id: zebra.nsi,v 1.30 2006-06-07 14:37:37 adam Exp $
+!include version.nsi
 
-!define VERSION "1.4.0"
+; 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"
 
-; Microsoft runtime CRT
 ; VS 2003
-; !define VS_RUNTIME "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
+; !define VS_RUNTIME_DLL "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"
+; VS 6.0
+; (no defines)
 
 !include "MUI.nsh"
 
@@ -75,16 +76,23 @@ SectionEnd ; end of default section
 Section "Zebra Runtime"
 	SectionIn 1 2
 	SetOutPath $INSTDIR\bin
-	File ..\bin\*.exe
+!ifdef VS_RUNTIME_DLL
+	File "${VS_RUNTIME_DLL}"
+!endif
+!ifdef VS_RUNTIME_MANIFEST
+	File "${VS_RUNTIME_MANIFEST}"
 	File ..\bin\*.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
+	File ..\bin\yaz3.dll
 	File ..\bin\libexpat.dll
-	File "${VS_RUNTIME}"
+	File ..\bin\icu*.dll
+	File ..\bin\yaz_icu3.dll
 SectionEnd
 
 Section "Zebra Development"
@@ -137,9 +145,6 @@ Section "Zebra Source"
 	File ..\isamb\*.c
 	SetOutPath $INSTDIR\data1
 	File ..\data1\*.c
-	SetOutPath $INSTDIR\recctrl
-	File ..\recctrl\*.c
-	File ..\recctrl\*.h
 	SetOutPath $INSTDIR\dict
 	File ..\dict\*.c
 	File ..\dict\*.h