X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fyaz.nsi;h=b76518fcb8821737e176821878c6aefb20a639c5;hb=c8d4ae132dd2544de8c6c2cb5de036670ec67d61;hp=c823694d3e84a0aed5ad9bb3dc0a4761169c3da1;hpb=ba68124b7321baff51997107f1cf9f0a78f62351;p=yaz-moved-to-github.git

diff --git a/win/yaz.nsi b/win/yaz.nsi
index c823694..b76518f 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,15 +1,22 @@
-; $Id: yaz.nsi,v 1.106 2007-03-16 08:08:11 adam Exp $
+; $Id: yaz.nsi,v 1.129 2008-02-21 10:48:45 adam Exp $
 
-!define VERSION "2.1.54"
+!define VERSION "3.0.26"
 
-; Microsoft runtime CRT
-; VS 2003
-!define VS_RUNTIME_DLL "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 ""
 
-; VS 2005
+; 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"
 
+
 !include "MUI.nsh"
 
 SetCompressor bzip2
@@ -92,13 +99,16 @@ 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\icudt38.dll
+	File ..\bin\icuin38.dll
+	File ..\bin\icuuc38.dll
+	File ..\bin\yaz_icu3.dll
 	File ..\bin\*.exe
 	SetOutPath $SMPROGRAMS\YAZ
  	CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
@@ -117,7 +127,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