From 85efdfd6ce365a0ac8502777b8c142be463cfe29 Mon Sep 17 00:00:00 2001 From: Fabio Alessandrelli Date: Tue, 20 Jun 2023 19:38:27 +0200 Subject: Linux ARM32/ARM64, better toolchains support. Needs updated godot-cpp to build library with custom toolchains. Make the OpenSSL and CMake tools more customizable letting the user override the default platform flags via build options. Improve dependency handling. --- SConstruct | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index fffebea..58b501b 100644 --- a/SConstruct +++ b/SConstruct @@ -145,9 +145,13 @@ for tool in ["openssl", "cmake", "rtc"]: ssl = env.OpenSSL() -rtc = env.BuildLibDataChannel() +rtc = env.BuildLibDataChannel(ssl) -env.Depends(sources, [ssl, rtc]) +# Forces building our sources after OpenSSL and libdatachannel. +# This is because OpenSSL headers are generated by their build system and SCons doesn't know about them. +# Note: This might not be necessary in this specific case since our sources doesn't include OpenSSL headers directly, +# but it's better to be safe in case of indirect inclusions by one of our other dependencies. +env.Depends(sources, ssl + rtc) # Make the shared library result_name = "libwebrtc_native{}{}".format(env["suffix"], env["SHLIBSUFFIX"]) -- cgit v1.2.3