X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fzebra.nsi;h=dd6e02f02bd27fe9d1eec9f0917170ee9581c738;hb=c9a42d334f292b889d643cf80f6b330c051a9597;hp=10d135adfd88df4cfe64c7950c4d2967a3859030;hpb=7fc79094615c3eaff009dfb0336821aaba8ea65a;p=idzebra-moved-to-github.git

diff --git a/win/zebra.nsi b/win/zebra.nsi
index 10d135a..dd6e02f 100644
--- a/win/zebra.nsi
+++ b/win/zebra.nsi
@@ -1,13 +1,16 @@
-; $Id: zebra.nsi,v 1.42 2007-09-12 07:46:41 adam Exp $
+; $Id: zebra.nsi,v 1.46 2007-12-20 19:09:47 adam Exp $
 
-!define VERSION "2.0.16"
+!define VERSION "2.0.22"
 
 ; 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"
+; !define VS_RUNTIME_DLL "c:\Program files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
+
+; VS 6.0
+; (no defines)
 
 !include "MUI.nsh"
 
@@ -75,10 +78,14 @@ SectionEnd ; end of default section
 Section "Zebra Runtime"
 	SectionIn 1 2
 	SetOutPath $INSTDIR\bin
+!ifdef VS_RUNTIME_DLL
 	File "${VS_RUNTIME_DLL}"
-; File "${VS_RUNTIME_MANIFEST}"
+!endif
+!ifdef VS_RUNTIME_MANIFEST
+	File "${VS_RUNTIME_MANIFEST}"
+	File ..\bin\*.manifest
+!endif
 	File ..\bin\*.exe
-; File ..\bin\*.manifest
 	File ..\bin\idzebra.dll
 	File ..\bin\iconv.dll
 	File ..\bin\zlib1.dll