X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fyaz.nsi;h=c75fa8f515b44f40eecdb4a4c42c22e3808c6d43;hb=87fdb8465b6f9a7e90a022de67e9dbbb57c4c5c9;hp=90fc7bd24992c4745ec9a1b4607739af67a6782d;hpb=6deaadd7501d45aaf921edb7526689d1b95681a6;p=yaz-moved-to-github.git

diff --git a/win/yaz.nsi b/win/yaz.nsi
index 90fc7bd..c75fa8f 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,7 +1,14 @@
-; $Id: yaz.nsi,v 1.85 2006-06-02 13:31:21 adam Exp $
+; $Id: yaz.nsi,v 1.94 2006-09-17 10:53:03 adam Exp $
 
-!define VERSION "2.1.20"
-!define VS_RUNTIME_LOCATION "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin"
+!define VERSION "2.1.30"
+
+; Microsoft runtime CRT
+; VS 2003
+!define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
+
+; 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"
 
@@ -84,12 +91,14 @@ Section "YAZ Runtime" YAZ_Runtime
 	ExecWait '"$INSTDIR\bin\yaz-ztest.exe" -remove'
 Noservice:
 	SetOutPath $INSTDIR\bin
-	File "${VS_RUNTIME_LOCATION}\msvcr71.dll"
+	File "${VS_RUNTIME_DLL}"
+;	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\*.exe
 	SetOutPath $SMPROGRAMS\YAZ
  	CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
@@ -109,9 +118,6 @@ Section "YAZ Development" YAZ_Development
 	File ..\include\yaz\*.h
 	SetOutPath $INSTDIR\lib
 	File ..\lib\yaz.lib
-	File ..\lib\yazd.lib
-	SetOutPath $INSTDIR\bin
-	File ..\bin\yazd.dll
 SectionEnd
 
 Section "YAZ Documentation" YAZ_Documentation