From 80786c0d2f702ba5d45ee249af1c194e341eeb45 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 12 Dec 2014 14:04:50 +0100 Subject: [PATCH] Update for VS 2013 --- win/zebra.nsi | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/win/zebra.nsi b/win/zebra.nsi index f4d2674..926b295 100644 --- a/win/zebra.nsi +++ b/win/zebra.nsi @@ -1,6 +1,6 @@ !include version.nsi -; Microsoft runtime CRT +; Microsoft runtime CRT ; Uncomment exactly ONE of the sections below ; 1: MSVC 6 ; !define VS_RUNTIME_DLL "" @@ -8,15 +8,19 @@ ; 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 "" +; !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" +; !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.0\VC\redist\x86\Microsoft.VC90.CRT\msvc*90.dll" -!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" +; !define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvc*90.dll" +; !define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" + +; 5: VS 2013 +!define VS_RUNTIME_DLL "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\msvc*.dll" +!define VS_RUNTIME_MANIFEST "" !include "MUI.nsh" @@ -85,7 +89,9 @@ Section "Zebra Runtime" SectionIn 1 2 SetOutPath $INSTDIR\bin File "${VS_RUNTIME_DLL}" +!if "${VS_RUNTIME_MANIFEST}" != "" File "${VS_RUNTIME_MANIFEST}" +!endif File ..\bin\*.exe File ..\bin\idzebra.dll File ..\bin\iconv.dll -- 1.7.10.4