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 2023-11-11 22:35:34 -06:00
parent 3fbb2a0086
commit 81d092e967
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deps/buildcore/scripts/pybb.py vendored
View File

@ -14,6 +14,7 @@
import os import os
import platform import platform
import shutil import shutil
import socket
import subprocess import subprocess
import sys import sys
from typing import List, Optional from typing import List, Optional
@ -115,7 +116,7 @@ def hostname() -> int:
def host_env() -> int: def host_env() -> int:
os_name = os.uname().sysname.lower() os_name = socket.gethostname().lower()
arch = platform.machine() arch = platform.machine()
if arch == 'amd64': if arch == 'amd64':
arch = 'x86_64' arch = 'x86_64'

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

@ -84,7 +84,7 @@ def main() -> int:
build_dir = f'{project_dir}/{args.build_root}/{build_config}' build_dir = f'{project_dir}/{args.build_root}/{build_config}'
util.rm(build_dir) util.rm(build_dir)
cmake_cmd = [ cmake_cmd = [
'cmake', '-S', project_dir, '-B', build_dir, build_tool, 'cmake', '-S', project_dir, '-B', build_dir,
'-DCMAKE_EXPORT_COMPILE_COMMANDS=ON', '-DCMAKE_EXPORT_COMPILE_COMMANDS=ON',
'-DCMAKE_TOOLCHAIN_FILE={:s}'.format(args.toolchain), '-DCMAKE_TOOLCHAIN_FILE={:s}'.format(args.toolchain),
'-DCMAKE_BUILD_TYPE={:s}'.format(build_type_arg), '-DCMAKE_BUILD_TYPE={:s}'.format(build_type_arg),
@ -92,6 +92,8 @@ def main() -> int:
'-DBUILDCORE_BUILD_CONFIG={:s}'.format(build_config), '-DBUILDCORE_BUILD_CONFIG={:s}'.format(build_config),
'-DBUILDCORE_TARGET={:s}'.format(args.target), '-DBUILDCORE_TARGET={:s}'.format(args.target),
] ]
if 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':

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

@ -28,11 +28,11 @@ def rm(path: str):
def get_os() -> str: def get_os() -> str:
return os.uname().sysname.lower() return platform.system().lower()
def get_arch() -> str: def get_arch() -> str:
arch = platform.machine() arch = platform.machine()
if arch == 'amd64': if arch.lower() == 'amd64':
arch = 'x86_64' arch = 'x86_64'
return arch return arch