diff options
Diffstat (limited to 'xorg-server')
| -rwxr-xr-x | xorg-server/installer/packageall.bat | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat index 9b5e543de..458c02aa2 100755 --- a/xorg-server/installer/packageall.bat +++ b/xorg-server/installer/packageall.bat @@ -8,13 +8,8 @@ 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\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
-)
+makensis.exe vcxsrv.nsi
+makensis.exe vcxsrv-debug.nsi
:skipx86
if "%1"=="nox64" goto skipx64
@@ -24,13 +19,8 @@ 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\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
-)
+makensis.exe vcxsrv-64.nsi
+makensis.exe vcxsrv-64-debug.nsi
:skipx64
|