X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=win%2Fzebra.nsi;h=a3857169cf23f5d9976fdbea9c5a029801e51b4f;hp=f402683244e428705285e55e2722a9974eaedf4b;hb=b0e96fd39e829ed6efb70a27999986fab11301f6;hpb=4fd652ea50465c7f90803ddedb7cea37893e372f diff --git a/win/zebra.nsi b/win/zebra.nsi index f402683..a385716 100644 --- a/win/zebra.nsi +++ b/win/zebra.nsi @@ -1,13 +1,13 @@ -; $Id: zebra.nsi,v 1.30 2006-06-07 14:37:37 adam Exp $ +; $Id: zebra.nsi,v 1.35 2006-09-22 12:44:04 adam 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.2" ; 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" + +; VS 2003 +!define VS_RUNTIME_DLL "c:\Program files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll" !include "MUI.nsh" @@ -75,8 +75,10 @@ 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\*.manifest File ..\bin\idzebra.dll File ..\bin\iconv.dll File ..\bin\zlib1.dll @@ -84,7 +86,6 @@ Section "Zebra Runtime" File ..\bin\libxslt.dll File ..\bin\yaz.dll File ..\bin\libexpat.dll - File "${VS_RUNTIME}" SectionEnd Section "Zebra Development" @@ -137,9 +138,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