From 6d8fefe38077f4d532c256e79cfcaf2a46c5269d Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 12 Nov 2013 16:58:49 +0100 Subject: Now use visual studio 2013 express edition for compilation --- xorg-server/installer/packageall.bat | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'xorg-server/installer/packageall.bat') diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat index d8b245029..5e9677e6e 100755 --- a/xorg-server/installer/packageall.bat +++ b/xorg-server/installer/packageall.bat @@ -3,10 +3,10 @@ if exist vcxsrv*.installer.exe del vcxsrv*.installer.exe if "%1"=="nox86" goto skipx86 -copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x86\Microsoft.VC110.CRT\msvcp110.dll" -copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x86\Microsoft.VC110.CRT\msvcr110.dll" -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" +copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\msvcp120.dll" +copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\msvcr120.dll" +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 @@ -19,10 +19,10 @@ if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" ( :skipx86 if "%1"=="nox64" goto skipx64 -copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x64\Microsoft.VC110.CRT\msvcp110.dll" -copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x64\Microsoft.VC110.CRT\msvcr110.dll" -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" +copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT\msvcp120.dll" +copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT\msvcr120.dll" +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 @@ -34,7 +34,7 @@ if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" ( :skipx64 -del msvcr110.dll -del msvcr110d.dll -del msvcp110.dll -del msvcp110d.dll +del msvcr120.dll +del msvcr120d.dll +del msvcp120.dll +del msvcp120d.dll -- cgit v1.2.3