X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fyaz.nsi;h=694e586be3ac8394e3eb9bfbeeeb5a546c7a1ce5;hp=f8f290a42a9284a1ebd684764419fa13c4015528;hb=ecbd263c8be1f35bde47ba8c119627a6dedb9b28;hpb=11db1845a1dfbe1e6fbc1715f9edce6071f63e0d

diff --git a/win/yaz.nsi b/win/yaz.nsi
index f8f290a..694e586 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,14 +1,21 @@
-; $Id: yaz.nsi,v 1.88 2006-06-07 18:23:22 adam Exp $
+; $Id: yaz.nsi,v 1.117 2007-08-22 09:09:03 adam Exp $
 
-!define VERSION "2.1.21"
+!define VERSION "3.0.10"
 
-; Microsoft runtime CRT
-; VS 2003
-; !define VS_RUNTIME "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
+; Microsoft runtime CRT 
+; Uncomment exactly ONE section of the three below
+; 1: MSVC 6
+!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"
+;!define VS_RUNTIME_MANIFEST ""
+
+; 3: 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 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"
 
 !include "MUI.nsh"
 
@@ -92,13 +99,12 @@ Section "YAZ Runtime" YAZ_Runtime
 Noservice:
 	SetOutPath $INSTDIR\bin
 	File "${VS_RUNTIME_DLL}"
-	File "${VS_RUNTIME_Manifest}"
+	File "${VS_RUNTIME_MANIFEST}"
 	File ..\bin\iconv.dll
 	File ..\bin\zlib1.dll
 	File ..\bin\libxml2.dll
 	File ..\bin\libxslt.dll
-	File ..\bin\yaz.dll
-	File ..\bin\*.manifest
+	File ..\bin\yaz3.dll
 	File ..\bin\*.exe
 	SetOutPath $SMPROGRAMS\YAZ
  	CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
@@ -117,7 +123,7 @@ Section "YAZ Development" YAZ_Development
 	SetOutPath $INSTDIR\include\yaz
 	File ..\include\yaz\*.h
 	SetOutPath $INSTDIR\lib
-	File ..\lib\yaz.lib
+	File ..\lib\yaz3.lib
 SectionEnd
 
 Section "YAZ Documentation" YAZ_Documentation