godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #74645 from omar-polo/scons-exit 

exit with non-zero status if not all freetype deps are all builtin or not
This commit is contained in:
Rémi Verschelde 2023-03-09 15:59:20 +01:00 committed by GitHub
parent d3415ae5aa ac04a0761e
commit c1128e911c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/linuxbsd/detect.py
View File

@ -70,7 +70,7 @@ def configure(env: "Environment"):
'Unsupported CPU architecture "%s" for Linux / *BSD. Supported architectures are: %s.' 'Unsupported CPU architecture "%s" for Linux / *BSD. Supported architectures are: %s.'
% (env["arch"], ", ".join(supported_arches)) % (env["arch"], ", ".join(supported_arches))
) )
sys.exit() sys.exit(255)
## Build type ## Build type
@ -208,7 +208,7 @@ def configure(env: "Environment"):
"freetype, libpng, zlib, graphite, harfbuzz.\n" "freetype, libpng, zlib, graphite, harfbuzz.\n"
"Please specify `builtin_<name>=no` for all of them, or none." "Please specify `builtin_<name>=no` for all of them, or none."
) )
sys.exit() sys.exit(255)
if not env["builtin_freetype"]: if not env["builtin_freetype"]:
env.ParseConfig("pkg-config freetype2 --cflags --libs") env.ParseConfig("pkg-config freetype2 --cflags --libs")