From fa490f64971a38c98d74dc6b55b2d88dd1f6c463 Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Tue, 31 Jan 2012 17:41:46 +0100 Subject: uv: upgrade to 3eb94e9 --- deps/uv/vcbuild.bat | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'deps/uv/vcbuild.bat') diff --git a/deps/uv/vcbuild.bat b/deps/uv/vcbuild.bat index bccefff9dc..644f574c22 100644 --- a/deps/uv/vcbuild.bat +++ b/deps/uv/vcbuild.bat @@ -64,9 +64,21 @@ echo Project files generated. @rem Skip project generation if requested. if defined nobuild goto run -if not defined VCINSTALLDIR echo Build skipped. To build, this file needs to run from VS cmd prompt.& goto run +@rem If not running in the VS build env, try to start it. If that fails, bail +@rem out. +if defined VCINSTALLDIR goto msbuild-found +if not defined VS100COMNTOOLS goto msbuild-not-found +if not exist "%VS100COMNTOOLS%\..\..\vc\vcvarsall.bat" goto msbuild-not-found +call "%VS100COMNTOOLS%\..\..\vc\vcvarsall.bat" +if not defined VCINSTALLDIR goto msbuild-not-found +goto msbuild-found + +:msbuild-not-found +echo Build skipped. To build, this file needs to run from VS cmd prompt. +goto run @rem Build the sln with msbuild. +:msbuild-found msbuild uv.sln /t:%target% /p:Configuration=%config% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo if errorlevel 1 goto exit -- cgit v1.2.3