Merge pull request #295 from naivisoftware/win64_check_env_fix

Fix check_build_environment arch check for AMD
napframework · Oct 24, 2023 · cee23ce · cee23ce
2 parents 9aaf903 + 4796fb8
commit cee23ce
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/tools/buildsystem/check_build_environment/win64/check_build_environment.bat b/tools/buildsystem/check_build_environment/win64/check_build_environment.bat
@@ -1,17 +1,16 @@
 @echo OFF
 
-reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set OS=32BIT || set OS=64BIT
+for /F "tokens=2* skip=2" %%a in ('reg query "HKLM\System\CurrentControlSet\Control\Session Manager\Environment" /v "PROCESSOR_ARCHITECTURE"') do set ARCH=%%b
 
-rem set OS=32BIT
-if %OS%==32BIT (
+if %ARCH%==AMD64 (
+    echo Checking x86-64 architecture: PASS
+) else (
     echo Checking x86-64 architecture: FAIL
     echo.
     echo NAP only supports x86-64 systems. Not continuing checks.
     echo Press key to close...
     pause
     exit /B
-) else (
-    echo Checking x86-64 architecture: PASS
 )
 
 set PYTHONPATH=""