diff options
| author | marha <marha@users.sourceforge.net> | 2013-12-21 14:54:00 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-12-21 14:54:00 +0100 |
| commit | f1ad13e02109671c5a16303e171bd2f81702ed72 (patch) | |
| tree | db0853d6f425916bc9a436970f5ed25b4a247ee9 /xorg-server | |
| parent | 90077a910e62ec55bc1e5a98f5946754c9c5f8bd (diff) | |
| download | vcxsrv-f1ad13e02109671c5a16303e171bd2f81702ed72.tar.gz vcxsrv-f1ad13e02109671c5a16303e171bd2f81702ed72.tar.bz2 vcxsrv-f1ad13e02109671c5a16303e171bd2f81702ed72.zip | |
New 64-bit version of nsis is installed in a different path
Diffstat (limited to 'xorg-server')
| -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 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
|