drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[buildcore] Windows fixes

Browse Source
This commit is contained in:
Gary Talent 2024-06-22 15:18:25 -05:00
parent 3b874c6e6a
commit f1ee645a0a
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
deps/buildcore/base.mk vendored
View File

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

2
deps/buildcore/scripts/setup-build.py vendored
View File

@ -96,7 +96,7 @@ def main() -> int:
cmake_cmd.append(build_tool) cmake_cmd.append(build_tool)
if qt_path != '': if qt_path != '':
cmake_cmd.append(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_cmd.append('-A x64')
cmake_err = subprocess.run(cmake_cmd).returncode cmake_err = subprocess.run(cmake_cmd).returncode

4
deps/buildcore/scripts/util.py vendored
View File

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