diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake
index 2d7102f3..e1eacf06 100644
--- a/src/libcec/cmake/CheckPlatformSupport.cmake
+++ b/src/libcec/cmake/CheckPlatformSupport.cmake
@@ -44,7 +44,8 @@ if(WIN32)
   add_definitions(-DTARGET_WINDOWS -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS -D_WINSOCKAPI_)
   set(LIB_DESTINATION ".")
   check_symbol_exists(_X64_ Windows.h WIN64)
-  if (${WIN64})
+  check_symbol_exists(_AMD64_ Windows.h AMD64)
+  if (DEFINED WIN64 OR DEFINED AMD64)
     set(LIB_INFO "${LIB_INFO} (x64)")
   else()
     add_definitions(-D_USE_32BIT_TIME_T)
diff --git a/windows/build-lib.cmd b/windows/build-lib.cmd
index d8a3f705..026f6264 100644
--- a/windows/build-lib.cmd
+++ b/windows/build-lib.cmd
@@ -8,7 +8,7 @@ SET MYDIR=%~dp0
 SET BUILDARCH=%1
 SET BUILDTYPE=%2
 SET VSVERSION=%3
-SET INSTALLPATH=%4
+SET INSTALLPATH=%~4
 SET GENTYPE=%5
 IF [%5] == [] GOTO missingparams
 
@@ -21,13 +21,13 @@ IF NOT EXIST "%MYDIR%..\src\platform\windows\build.cmd" (
 )
 
 ECHO Build platform library for %BUILDARCH%
-CALL %MYDIR%..\src\platform\windows\build-lib.cmd %BUILDARCH% %BUILDTYPE% %VSVERSION% %INSTALLPATH%
-del /s /f /q %BUILDTARGET%
+CALL "%MYDIR%..\src\platform\windows\build-lib.cmd" %BUILDARCH% %BUILDTYPE% %VSVERSION% "%INSTALLPATH%"
+del /s /f /q "%BUILDTARGET%"
 
 ECHO Build libCEC for %BUILDARCH%
-CALL %MYDIR%..\support\windows\cmake\generate.cmd %BUILDARCH% %GENTYPE% %MYDIR%..\ %BUILDTARGET% %TARGET% %BUILDTYPE% %VSVERSION%
+CALL "%MYDIR%..\support\windows\cmake\generate.cmd" %BUILDARCH% %GENTYPE% "%MYDIR%.." "%BUILDTARGET%" "%TARGET%" %BUILDTYPE% %VSVERSION%
 IF "%GENTYPE%" == "nmake" (
-  CALL %MYDIR%..\support\windows\cmake\build.cmd %BUILDARCH% %BUILDTARGET% %VSVERSION%
+  CALL "%MYDIR%..\support\windows\cmake\build.cmd" %BUILDARCH% "%BUILDTARGET%" %VSVERSION%
   IF NOT EXIST "%TARGET%\cec.dll" (
     echo "Failed to build %TARGET%\cec.dll"
     exit /b 1
diff --git a/windows/build.cmd b/windows/build.cmd
index 7dc42c96..d20cb676 100644
--- a/windows/build.cmd
+++ b/windows/build.cmd
@@ -19,17 +19,17 @@ IF NOT EXIST "%MYDIR%..\src\platform\windows\build.cmd" (
   GOTO exit
 )
 
-rmdir /s /q %MYDIR%..\build 2> nul
+rmdir /s /q "%MYDIR%..\build" 2> nul
 
 FOR %%T IN (amd64 x86) DO (
-  echo Run %MYDIR%build-lib.cmd %%T
-  CALL %MYDIR%build-lib.cmd %%T %BUILDTYPE% %VSVERSION% %INSTALLPATH% nmake
+  echo Run "%MYDIR%build-lib.cmd" %%T
+  CALL "%MYDIR%build-lib.cmd" %%T %BUILDTYPE% %VSVERSION% "%INSTALLPATH%" nmake
   IF NOT ERRORLEVEL 0 (
     GOTO builderror
   )
 )
 
-rmdir /s /q %MYDIR%..\build\cmake 2> nul
+rmdir /s /q "%MYDIR%..\build\cmake" 2> nul
 exit /b 0
 
 :builderror