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 /modules/jpg/SCsub | |
| 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 'modules/jpg/SCsub')
| -rw-r--r-- | modules/jpg/SCsub | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/modules/jpg/SCsub b/modules/jpg/SCsub index 8ee8e6dd6e..7c6ceeea29 100644 --- a/modules/jpg/SCsub +++ b/modules/jpg/SCsub @@ -6,6 +6,9 @@ Import("env_modules") env_jpg = env_modules.Clone() # Thirdparty source files + +thirdparty_obj = [] + # Not unbundled for now as they are not commonly available as shared library thirdparty_dir = "#thirdparty/jpeg-compressor/" thirdparty_sources = [ @@ -17,7 +20,15 @@ env_jpg.Prepend(CPPPATH=[thirdparty_dir]) env_thirdparty = env_jpg.Clone() env_thirdparty.disable_warnings() -env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources) +env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources) +env.modules_sources += thirdparty_obj + +# Godot source files + +module_obj = [] + +env_jpg.add_source_files(module_obj, "*.cpp") +env.modules_sources += module_obj -# Godot's own source files -env_jpg.add_source_files(env.modules_sources, "*.cpp") +# Needed to force rebuilding the module files when the thirdparty library is updated. +env.Depends(module_obj, thirdparty_obj) |