diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2014-04-05 10:57:08 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2014-04-05 10:57:08 -0400 |
| commit | 3691880b30d149d27b9116f48069cf6e33bb6ff9 (patch) | |
| tree | 2d60a1f9b4b3ea0c30487fdf81b16d5b439f60e9 /xorg-server/installer | |
| parent | 4888b09cfc72713f460dd7457fb2b7eca0abb91c (diff) | |
| download | vcxsrv-3691880b30d149d27b9116f48069cf6e33bb6ff9.tar.gz vcxsrv-3691880b30d149d27b9116f48069cf6e33bb6ff9.tar.bz2 vcxsrv-3691880b30d149d27b9116f48069cf6e33bb6ff9.zip | |
Initial work to get VcXsrv to build with MSVC2012 xp compatibility, and for my build environment with cygwin bash.
Diffstat (limited to 'xorg-server/installer')
| -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 d8b245029..e5e765d3a 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\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 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\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
|