diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2014-04-05 12:58:11 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2014-04-05 12:58:11 -0400 |
| commit | 0369f4edc8c0630f86fe2429d3c68a1aae1d7fdb (patch) | |
| tree | ce9f2086af831bc2a541b760a1c0cf86c55f59b2 | |
| parent | 1c038fd0033fc8ba7dcc6b306ce218640365ffbb (diff) | |
| download | vcxsrv-0369f4edc8c0630f86fe2429d3c68a1aae1d7fdb.tar.gz vcxsrv-0369f4edc8c0630f86fe2429d3c68a1aae1d7fdb.tar.bz2 vcxsrv-0369f4edc8c0630f86fe2429d3c68a1aae1d7fdb.zip | |
Switch back from regular NSIS to Unicode NSIS. The upstream VcXsrv project is using the latter.
| -rwxr-xr-x | xorg-server/installer/packageall.bat | 12 |
1 files 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
|