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

diff --git a/win/zebra.nsi b/win/zebra.nsi
index f402683..6c0253c 100644
--- a/win/zebra.nsi
+++ b/win/zebra.nsi
@@ -1,13 +1,10 @@
-; $Id: zebra.nsi,v 1.30 2006-06-07 14:37:37 adam Exp $
+; $Id: zebra.nsi,v 1.32 2006-06-26 15:11:44 marc 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"
+!define VERSION "2.0.0"
 
 ; VS 2005
-!define VS_RUNTIME "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll"
+!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"
 
 !include "MUI.nsh"
 
@@ -75,6 +72,8 @@ SectionEnd ; end of default section
 Section "Zebra Runtime"
 	SectionIn 1 2
 	SetOutPath $INSTDIR\bin
+	File "${VS_RUNTIME_DLL}"
+	File "${VS_RUNTIME_MANIFEST}"
 	File ..\bin\*.exe
 	File ..\bin\*.manifest
 	File ..\bin\idzebra.dll
@@ -84,7 +83,6 @@ Section "Zebra Runtime"
 	File ..\bin\libxslt.dll
 	File ..\bin\yaz.dll
 	File ..\bin\libexpat.dll
-	File "${VS_RUNTIME}"
 SectionEnd
 
 Section "Zebra Development"