[buildcore] Windows fixes
This commit is contained in:
parent
3b874c6e6a
commit
f1ee645a0a
5
deps/buildcore/base.mk
vendored
5
deps/buildcore/base.mk
vendored
@ -10,10 +10,9 @@ 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:])
|
||||
endif
|
||||
|
||||
ifneq ($(shell which python3 2> /dev/null),)
|
||||
BC_CMD_HOST_PY3=python3
|
||||
else
|
||||
@ -24,6 +23,8 @@ else
|
||||
exit 1
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
ifdef BC_VAR_USE_DOCKER_DEVENV
|
||||
ifneq ($(shell which docker 2> /dev/null),)
|
||||
|
2
deps/buildcore/scripts/setup-build.py
vendored
2
deps/buildcore/scripts/setup-build.py
vendored
@ -96,7 +96,7 @@ def main() -> int:
|
||||
cmake_cmd.append(build_tool)
|
||||
if qt_path != '':
|
||||
cmake_cmd.append(qt_path)
|
||||
if platform.system() == 'Windows':
|
||||
if platform.system() == 'Windows' and platform.system() == 'AMD64':
|
||||
cmake_cmd.append('-A x64')
|
||||
|
||||
cmake_err = subprocess.run(cmake_cmd).returncode
|
||||
|
4
deps/buildcore/scripts/util.py
vendored
4
deps/buildcore/scripts/util.py
vendored
@ -32,7 +32,7 @@ def get_os() -> str:
|
||||
|
||||
|
||||
def get_arch() -> str:
|
||||
arch = platform.machine()
|
||||
if arch.lower() == 'amd64':
|
||||
arch = platform.machine().lower()
|
||||
if arch == 'amd64':
|
||||
arch = 'x86_64'
|
||||
return arch
|
||||
|
Loading…
Reference in New Issue
Block a user