From 1ba15549ff13d0bfcf4e82c6005d3cc40f2bf098 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 25 Jul 2013 10:18:29 +0200 Subject: Solved compilation problems due to latest merge --- xorg-server/installer/packageall.bat | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'xorg-server/installer/packageall.bat') diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat index 71a1a480b..edf1ba4eb 100755 --- a/xorg-server/installer/packageall.bat +++ b/xorg-server/installer/packageall.bat @@ -1,6 +1,8 @@ @echo off if exist vcxsrv*.installer.exe del vcxsrv*.installer.exe +if "%1"=="nox86" goto skipx86 + copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\x86\Microsoft.VC100.CRT\msvcp100.dll" copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\x86\Microsoft.VC100.CRT\msvcr100.dll" copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC100.DebugCRT\msvcp100d.dll" @@ -14,6 +16,9 @@ if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" ( "C:\Program Files\NSIS\makensis.exe" vcxsrv-debug.nsi ) +:skipx86 +if "%1"=="nox64" goto skipx64 + copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\x64\Microsoft.VC100.CRT\msvcp100.dll" copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\x64\Microsoft.VC100.CRT\msvcr100.dll" copy "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC100.DebugCRT\msvcp100d.dll" @@ -27,6 +32,8 @@ if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" ( "C:\Program Files\NSIS\makensis.exe" vcxsrv-64-debug.nsi ) +:skipx64 + del msvcr100.dll del msvcr100d.dll del msvcp100.dll -- cgit v1.2.3