X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=win%2Fzebra.nsi;h=192711e733fd51603d3329be268c87bcd9b97ff5;hp=c8f79d3875d152e0f16e4d74c915670f7c52f30f;hb=a46626a5becb4d5e0b16846d783dfe9befe7d61c;hpb=6e2dd5682dff4d91a1f6f23faaf4011a4e1c6d6c diff --git a/win/zebra.nsi b/win/zebra.nsi index c8f79d3..192711e 100644 --- a/win/zebra.nsi +++ b/win/zebra.nsi @@ -1,10 +1,14 @@ -; $Id: zebra.nsi,v 1.33 2006-07-05 12:34:17 adam Exp $ - -!define VERSION "2.0.0" +!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" +; !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" + +; VS 6.0 +; (no defines) !include "MUI.nsh" @@ -72,17 +76,23 @@ 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 File "${VS_RUNTIME_MANIFEST}" - File ..\bin\*.exe 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 ..\bin\icu*.dll + File ..\bin\yaz_icu3.dll SectionEnd Section "Zebra Development"