diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2014-10-18 22:17:57 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2014-10-18 22:17:57 -0400 |
| commit | 212ca5c6023b6b7455ad64b2c29aeff82f301a03 (patch) | |
| tree | 80d6ba007600dcfbe9e37d2704afe1cc04d00aa6 | |
| parent | 13991a15faa9e5623e4b4fba8795bb7aac115dc9 (diff) | |
| download | vcxsrv-1.15.2.1-xp+vc2013+x2go1.tar.gz vcxsrv-1.15.2.1-xp+vc2013+x2go1.tar.bz2 vcxsrv-1.15.2.1-xp+vc2013+x2go1.zip | |
Call makensis.exe from the PATH1.15.2.1-xp+vc2013+x2go1
| -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
|