diff --git a/platforms/windows/Build_Binary_x86.bat b/platforms/windows/Build_Binary_x86.bat
index 22f34660e..671a3f593 100644
--- a/platforms/windows/Build_Binary_x86.bat
+++ b/platforms/windows/Build_Binary_x86.bat
@@ -33,11 +33,12 @@ SET VS2010="%VS100COMNTOOLS%..\IDE\devenv.com"
 SET VS2012="%VS110COMNTOOLS%..\IDE\devenv.com"
 SET VS2013="%VS120COMNTOOLS%..\IDE\devenv.com"
 SET VS2015="%VS140COMNTOOLS%..\IDE\devenv.com"
-SET MSBUILD35="%windir%\Microsoft.NET\Framework\v3.5\MSBuild.exe"
-SET MSBUILD40="%windir%\Microsoft.NET\Framework64\v4.0.30319\MSBuild.exe"
+IF EXIST "%windir%\Microsoft.NET\Framework\v3.5\MSBuild.exe" SET MSBUILD35=%windir%\Microsoft.NET\Framework\v3.5\MSBuild.exe
+IF EXIST "%windir%\Microsoft.NET\Framework64\v3.5\MSBuild.exe" SET MSBUILD35=%windir%\Microsoft.NET\Framework64\v3.5\MSBuild.exe
+IF EXIST "%windir%\Microsoft.NET\Framework64\v4.0.30319\MSBuild.exe" SET MSBUILD40=%windir%\Microsoft.NET\Framework64\v4.0.30319\MSBuild.exe
 
-IF EXIST %MSBUILD35% SET DEVENV=%MSBUILD35%
-IF EXIST %MSBUILD40% SET DEVENV=%MSBUILD40%
+IF EXIST "%MSBUILD35%" SET DEVENV="%MSBUILD35%"
+IF EXIST "%MSBUILD40%" SET DEVENV="%MSBUILD40%"
 IF EXIST %VS2005% SET DEVENV=%VS2005% 
 IF EXIST %VS2008% SET DEVENV=%VS2008%
 IF EXIST %VS2010% SET DEVENV=%VS2010%
@@ -45,13 +46,14 @@ IF "%4%"=="openni" GOTO SET_BUILD_TYPE
 IF EXIST %VS2012% SET DEVENV=%VS2012%
 
 IF EXIST %VS2013% SET DEVENV=%VS2013%
-IF "%2%"=="gpu" GOTO SET_BUILD_TYPE
-IF NOT "%3%"=="WindowsStore10" GOTO SET_BUILD_TYPE
 IF EXIST %VS2015% SET DEVENV=%VS2015%
+REM IF "%2%"=="gpu" GOTO SET_BUILD_TYPE
+REM IF NOT "%3%"=="WindowsStore10" GOTO SET_BUILD_TYPE
+
 
 :SET_BUILD_TYPE
-IF %DEVENV%==%MSBUILD35% SET BUILD_TYPE=/property:Configuration=Release
-IF %DEVENV%==%MSBUILD40% SET BUILD_TYPE=/property:Configuration=Release
+IF %DEVENV%=="%MSBUILD35%" SET BUILD_TYPE=/property:Configuration=Release
+IF %DEVENV%=="%MSBUILD40%" SET BUILD_TYPE=/property:Configuration=Release
 IF %DEVENV%==%VS2005% SET BUILD_TYPE=/Build Release
 IF %DEVENV%==%VS2008% SET BUILD_TYPE=/Build Release
 IF %DEVENV%==%VS2010% SET BUILD_TYPE=/Build Release
@@ -59,8 +61,8 @@ IF %DEVENV%==%VS2012% SET BUILD_TYPE=/Build Release
 IF %DEVENV%==%VS2013% SET BUILD_TYPE=/Build Release
 IF %DEVENV%==%VS2015% SET BUILD_TYPE=/Build Release
 
-IF %DEVENV%==%MSBUILD35% SET CMAKE_CONF="Visual Studio 12 2005%OS_MODE%"
-IF %DEVENV%==%MSBUILD40% SET CMAKE_CONF="Visual Studio 12 2005%OS_MODE%"
+IF %DEVENV%=="%MSBUILD35%" SET CMAKE_CONF="Visual Studio 12 2005%OS_MODE%"
+IF %DEVENV%=="%MSBUILD40%" SET CMAKE_CONF="Visual Studio 12 2005%OS_MODE%"
 IF %DEVENV%==%VS2005% SET CMAKE_CONF="Visual Studio 8 2005%OS_MODE%"
 IF %DEVENV%==%VS2008% SET CMAKE_CONF="Visual Studio 9 2008%OS_MODE%"
 IF %DEVENV%==%VS2010% SET CMAKE_CONF="Visual Studio 10%OS_MODE%"
@@ -154,6 +156,7 @@ IF %DEVENV%==%VS2008% SET CUDA_HOST_COMPILER=%VS90COMNTOOLS%..\..\VC\bin\cl.exe
 IF %DEVENV%==%VS2010% SET CUDA_HOST_COMPILER=%VS100COMNTOOLS%..\..\VC\bin\cl.exe
 IF %DEVENV%==%VS2012% SET CUDA_HOST_COMPILER=%VS110COMNTOOLS%..\..\VC\bin\cl.exe
 IF %DEVENV%==%VS2013% SET CUDA_HOST_COMPILER=%VS120COMNTOOLS%..\..\VC\bin\cl.exe
+IF %DEVENV%==%VS2015% SET CUDA_HOST_COMPILER=%VS140COMNTOOLS%..\..\VC\bin\cl.exe
 REM SET CUDA_HOST_COMPILER=%DEVENV%
 
 IF "%OS_MODE%"==" Win64" (