From 43849124700caab5cd76369c0fea934ca756e3a7 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 19 Jan 2010 12:09:12 +0100 Subject: [PATCH] Use VS 2008 for NSI --- win/yaz.nsi | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/win/yaz.nsi b/win/yaz.nsi index eb46efe..6c2b261 100644 --- a/win/yaz.nsi +++ b/win/yaz.nsi @@ -6,8 +6,8 @@ ; Microsoft runtime CRT ; Uncomment exactly ONE section of the three below ; 1: MSVC 6 -!define VS_RUNTIME_DLL "" -!define VS_RUNTIME_MANIFEST "" +; !define VS_RUNTIME_DLL "" +; !define VS_RUNTIME_MANIFEST "" ; 2: VS 2003 ; !define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll" @@ -17,6 +17,10 @@ ;!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" +; 4: VS 2008 +!define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio 9\VC\redist\x86\Microsoft.VC90.CRT\msvcr90.dll" +!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 9\VC\redist\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" + !include "MUI.nsh" @@ -105,9 +109,8 @@ Noservice: File ..\bin\zlib1.dll File ..\bin\libxml2.dll File ..\bin\libxslt.dll - File ..\bin\yaz4.dll File ..\bin\icu*.dll - File ..\bin\yaz_icu4.dll + File ..\bin\yaz*.dll File ..\bin\*.exe SetOutPath $SMPROGRAMS\YAZ CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \ @@ -126,7 +129,7 @@ Section "YAZ Development" YAZ_Development SetOutPath $INSTDIR\include\yaz File ..\include\yaz\*.h SetOutPath $INSTDIR\lib - File ..\lib\yaz3.lib + File ..\lib\yaz*.lib SectionEnd Section "YAZ Documentation" YAZ_Documentation -- 1.7.10.4