deps/buildcore/base.mk

@@ -10,22 +10,21 @@ ifeq (${OS},Windows_NT)
 	SHELL := powershell.exe
 	.SHELLFLAGS := -NoProfile -Command
 	BC_VAR_OS=windows
-	BC_CMD_HOST_PY3=python
 else
 	BC_VAR_OS=$(shell uname | tr [:upper:] [:lower:])
-	ifneq ($(shell which python3 2> /dev/null),)
+endif
+
+ifneq ($(shell which python3 2> /dev/null),)
 	BC_CMD_HOST_PY3=python3
-	else
+else
 	ifeq ($(shell python -c 'import sys; print(sys.version_info[0])'),3)
 		BC_CMD_HOST_PY3=python
 	else
 		echo 'Please install Python3 on host'
 		exit 1
 	endif
-	endif
 endif
 
-
 ifdef BC_VAR_USE_DOCKER_DEVENV
 	ifneq ($(shell which docker 2> /dev/null),)
 		BC_VAR_DEVENV=devenv$(shell pwd | sed 's/\//-/g')

deps/buildcore/scripts/setup-build.py

@@ -96,7 +96,7 @@ def main() -> int:
         cmake_cmd.append(build_tool)
     if qt_path != '':
         cmake_cmd.append(qt_path)
-    if platform.system() == 'Windows' and platform.system() == 'AMD64':
+    if platform.system() == 'Windows':
         cmake_cmd.append('-A x64')
 
     cmake_err = subprocess.run(cmake_cmd).returncode

deps/buildcore/scripts/util.py

@@ -32,7 +32,7 @@ def get_os() -> str:
 
 
 def get_arch() -> str:
-    arch = platform.machine().lower()
+    arch = platform.machine()
-    if arch == 'amd64':
+    if arch.lower() == 'amd64':
         arch = 'x86_64'
     return arch

deps/ox/src/ox/std/hardware.hpp

@@ -12,9 +12,9 @@
 #define OX_ARCH_x86_64
 #elif defined(__i386__) || defined(_M_IX86)
 #define OX_ARCH_x86_32
-#elif defined(__arm64__) || defined(__aarch64__) || defined(_M_ARM64)
+#elif defined(__arm64__) || defined(__aarch64__)
 #define OX_ARCH_ARM64
-#elif defined(__arm__) || defined(_M_ARM)
+#elif defined(__arm__)
 #define OX_ARCH_ARM
 #endif