diff options
| author | Thaddeus Crews <repiteo@outlook.com> | 2024-11-13 08:34:29 -0600 |
|---|---|---|
| committer | Thaddeus Crews <repiteo@outlook.com> | 2024-11-13 08:34:29 -0600 |
| commit | 896d3bd0d10dba8f6626dd4e543716e7f2d28bed (patch) | |
| tree | 1a6b545a65e50b3840e48a998b02aa7501e76aa4 /platform | |
| parent | ad97ef8c9bd20d5b580090706e5a74d9e41df2af (diff) | |
| parent | a42b8e241309a2c763a62aabaeec83925621335d (diff) | |
| download | redot-engine-896d3bd0d10dba8f6626dd4e543716e7f2d28bed.tar.gz | |
Merge pull request #99171 from dustdfg/pkg_config
Buildsystem: Use pkg-config for miniupnpc and mbedtls
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/linuxbsd/detect.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py index 2fd573da75..c8202b147d 100644 --- a/platform/linuxbsd/detect.py +++ b/platform/linuxbsd/detect.py @@ -279,16 +279,18 @@ def configure(env: "SConsEnvironment"): env.ParseConfig("pkg-config libwebp --cflags --libs") if not env["builtin_mbedtls"]: - # mbedTLS does not provide a pkgconfig config yet. See https://github.com/ARMmbed/mbedtls/issues/228 - env.Append(LIBS=["mbedtls", "mbedcrypto", "mbedx509"]) + # mbedTLS only provides a pkgconfig file since 3.6.0, but we still support 2.28.x, + # so fallback to manually specifying LIBS if it fails. + if os.system("pkg-config --exists mbedtls") == 0: # 0 means found + env.ParseConfig("pkg-config mbedtls mbedcrypto mbedx509 --cflags --libs") + else: + env.Append(LIBS=["mbedtls", "mbedcrypto", "mbedx509"]) if not env["builtin_wslay"]: env.ParseConfig("pkg-config libwslay --cflags --libs") if not env["builtin_miniupnpc"]: - # No pkgconfig file so far, hardcode default paths. - env.Prepend(CPPPATH=["/usr/include/miniupnpc"]) - env.Append(LIBS=["miniupnpc"]) + env.ParseConfig("pkg-config miniupnpc --cflags --libs") # On Linux wchar_t should be 32-bits # 16-bit library shouldn't be required due to compiler optimizations |