Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-10-06 09:17:07 +02:00
Code Issues Projects Releases Activity

Default to x64 for first build on osx

Browse Source
This commit is contained in:
Elias Steurer 2023-02-11 14:12:44 +01:00
parent 5abaf85b3f
commit 858e72e066
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Tools/build.py
View File

@ -97,7 +97,11 @@ def execute(
# temporary files in the build directory.
clean_build_dir(build_config.build_folder)
if platform.system() == "Darwin":
build_config.build_architecture = "x64"
build_config.cmake_target_triplet = "x64-osx"
build_config.cmake_osx_architectures = "-DCMAKE_OSX_ARCHITECTURES=x86_64"
# Runs cmake configure and cmake build
step_time = time.time()
build_result = build(build_config, build_result)
@ -106,14 +110,9 @@ def execute(
if platform.system() == "Darwin":
# Swap the architecture for the second build
if build_config.build_architecture == "arm64":
build_config.build_architecture = "x64"
build_config.cmake_target_triplet = "x64-osx"
build_config.cmake_osx_architectures = "-DCMAKE_OSX_ARCHITECTURES=x86_64"
else:
build_config.build_architecture = "arm64"
build_config.cmake_target_triplet = "arm64-osx"
build_config.cmake_osx_architectures = "-DCMAKE_OSX_ARCHITECTURES=arm64"
build_config.build_architecture = "arm64"
build_config.cmake_target_triplet = "arm64-osx"
build_config.cmake_osx_architectures = "-DCMAKE_OSX_ARCHITECTURES=arm64"
# Make sure the script is always started from the same folder
build_config.root_path = cd_repo_root_path()