diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2020-12-18 13:40:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-18 13:40:33 +0100 |
| commit | 214a22b98e5d74a9b49346d5021641db6a9899cf (patch) | |
| tree | 83c699aa9ac48d0de1b5ae90c0b9752f21679747 /platform | |
| parent | 126d88bce402572072c2f8ca792ee491dc2a15f4 (diff) | |
| parent | c7b53c03ae7f7feb45a6023ee5cf764025ebb5e1 (diff) | |
Merge pull request #44457 from akien-mga/scons-thirdparty-lib-depends
SCons: Add explicit dependencies on thirdparty code in cloned env
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/SCsub | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/platform/android/SCsub b/platform/android/SCsub index d8013b0baf..7e9dac926c 100644 --- a/platform/android/SCsub +++ b/platform/android/SCsub @@ -29,10 +29,14 @@ for x in android_files: env_thirdparty = env_android.Clone() env_thirdparty.disable_warnings() -android_objects.append(env_thirdparty.SharedObject("#thirdparty/misc/ifaddrs-android.cc")) +thirdparty_obj = env_thirdparty.SharedObject("#thirdparty/misc/ifaddrs-android.cc") +android_objects.append(thirdparty_obj) lib = env_android.add_shared_library("#bin/libgodot", [android_objects], SHLIBSUFFIX=env["SHLIBSUFFIX"]) +# Needed to force rebuilding the platform files when the thirdparty code is updated. +env.Depends(lib, thirdparty_obj) + lib_arch_dir = "" if env["android_arch"] == "armv7": lib_arch_dir = "armeabi-v7a" |