From 0369f4edc8c0630f86fe2429d3c68a1aae1d7fdb Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Sat, 5 Apr 2014 12:58:11 -0400 Subject: Switch back from regular NSIS to Unicode NSIS. The upstream VcXsrv project is using the latter. --- xorg-server/installer/packageall.bat | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat index e5e765d3a..d8b245029 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 11.0\VC\redist\x86\Microsof copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC110.DebugCRT\msvcp110d.dll" copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC110.DebugCRT\msvcr110d.dll" -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 +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 ) 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 11.0\VC\redist\x64\Microsof copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC110.DebugCRT\msvcp110d.dll" copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC110.DebugCRT\msvcr110d.dll" -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 +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 ) else ( "C:\Program Files\NSIS\makensis.exe" vcxsrv-64.nsi "C:\Program Files\NSIS\makensis.exe" vcxsrv-64-debug.nsi -- cgit v1.2.3