diff --git a/ClickToBuild.cmd b/ClickToBuild.cmd
index f397912ac..5da47b771 100644
--- a/ClickToBuild.cmd
+++ b/ClickToBuild.cmd
@@ -1,2 +1,19 @@
+
+if "%WindowsSdkDir%" neq "" goto build
+if exist "%ProgramFiles%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" goto initialize2k8
+echo "Unable to detect suitable environment. Build may not succeed."
+goto build
+
+
+:initialize2k8
+call "%ProgramFiles%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
+goto build
+
+
+:build
 call build
 pause
+goto end
+
+
+:end
diff --git a/build.cmd b/build.cmd
index b71920d67..8e320d6af 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,2 +1,2 @@
-if .%1.==.. build Build
-msbuild /t:%1
+if "%~1"=="" build Build
+msbuild /t:%~1