X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=win%2Fzebra.nsi;h=192711e733fd51603d3329be268c87bcd9b97ff5;hp=1c84b90e46d8572062834cc47b3f639715ffcc4d;hb=a46626a5becb4d5e0b16846d783dfe9befe7d61c;hpb=3de37d13913bc23896efd6639c6e1742a9e43fde diff --git a/win/zebra.nsi b/win/zebra.nsi index 1c84b90..192711e 100644 --- a/win/zebra.nsi +++ b/win/zebra.nsi @@ -1,13 +1,14 @@ -; $Id: zebra.nsi,v 1.41 2007-05-09 07:36:06 adam Exp $ - -!define VERSION "2.0.14" +!define VERSION "2.0.33" ; 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 +76,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 @@ -86,6 +91,8 @@ Section "Zebra Runtime" File ..\bin\libxslt.dll File ..\bin\yaz3.dll File ..\bin\libexpat.dll + File ..\bin\icu*.dll + File ..\bin\yaz_icu3.dll SectionEnd Section "Zebra Development"