From f1ad13e02109671c5a16303e171bd2f81702ed72 Mon Sep 17 00:00:00 2001 From: marha Date: Sat, 21 Dec 2013 14:54:00 +0100 Subject: New 64-bit version of nsis is installed in a different path --- xorg-server/installer/packageall.bat | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'xorg-server') diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat index 5e9677e6e..9b5e543de 100755 --- a/xorg-server/installer/packageall.bat +++ b/xorg-server/installer/packageall.bat @@ -8,9 +8,9 @@ copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsof copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC120.DebugCRT\msvcp120d.dll" copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC120.DebugCRT\msvcr120d.dll" -if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" ( - "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv.nsi - "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv-debug.nsi +if exist "C:\Program Files (x86)\NSIS\makensis.exe" ( + "C:\Program Files (x86)\NSIS\makensis.exe" vcxsrv.nsi + "C:\Program Files (x86)\NSIS\makensis.exe" vcxsrv-debug.nsi ) else ( "C:\Program Files\NSIS\makensis.exe" vcxsrv.nsi "C:\Program Files\NSIS\makensis.exe" vcxsrv-debug.nsi @@ -24,9 +24,9 @@ copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsof copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC120.DebugCRT\msvcp120d.dll" copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC120.DebugCRT\msvcr120d.dll" -if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" ( - "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv-64.nsi - "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv-64-debug.nsi +if exist "C:\Program Files (x86)\NSIS\makensis.exe" ( + "C:\Program Files (x86)\NSIS\makensis.exe" vcxsrv-64.nsi + "C:\Program Files (x86)\NSIS\makensis.exe" vcxsrv-64-debug.nsi ) else ( "C:\Program Files\NSIS\makensis.exe" vcxsrv-64.nsi "C:\Program Files\NSIS\makensis.exe" vcxsrv-64-debug.nsi -- cgit v1.2.3