diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-05-17 11:14:00 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-05-17 11:14:00 +0200 |
| commit | c4889e4793b6e1b5a3fce265bd12eb6c14cfca60 (patch) | |
| tree | abb04d02cf8eb6a3b1d81de8a09ae0094f098a4a /modules | |
| parent | b201c7fc137efd54b35060fcd3e78f5dbf46b8d6 (diff) | |
| parent | 831ebda80692e66fd1c0e049f105ed525316fad9 (diff) | |
| download | redot-engine-c4889e4793b6e1b5a3fce265bd12eb6c14cfca60.tar.gz | |
Merge pull request #91901 from akien-mga/scons-thorvg-webp-loader-opt-out
thorvg: Disable webp loader if corresponding module is disabled
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/svg/SCsub | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/modules/svg/SCsub b/modules/svg/SCsub index 0e21c1e6d7..a32be0e41a 100644 --- a/modules/svg/SCsub +++ b/modules/svg/SCsub @@ -26,7 +26,6 @@ thirdparty_sources = [ "src/loaders/raw/tvgRawLoader.cpp", # image loaders "src/loaders/external_png/tvgPngLoader.cpp", - "src/loaders/external_webp/tvgWebpLoader.cpp", "src/loaders/jpg/tvgJpgd.cpp", "src/loaders/jpg/tvgJpgLoader.cpp", # renderer common @@ -59,6 +58,10 @@ thirdparty_sources = [ "src/renderer/sw_engine/tvgSwStroke.cpp", ] +if env["module_webp_enabled"]: + thirdparty_sources += ["src/loaders/external_webp/tvgWebpLoader.cpp"] + env_svg.Append(CPPDEFINES=["THORVG_WEBP_LOADER_SUPPORT"]) + thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] env_svg.Prepend(CPPPATH=[thirdparty_dir + "inc"]) @@ -76,12 +79,15 @@ env_thirdparty.Prepend( thirdparty_dir + "src/renderer/sw_engine", thirdparty_dir + "src/loaders/raw", thirdparty_dir + "src/loaders/external_png", - thirdparty_dir + "src/loaders/external_webp", thirdparty_dir + "src/loaders/jpg", - "#thirdparty/libpng", - "#thirdparty/libwebp/src", ] ) +if env["builtin_libpng"]: + env_thirdparty.Prepend(CPPPATH=["#thirdparty/libpng"]) +if env["module_webp_enabled"]: + env_thirdparty.Prepend(CPPPATH=[thirdparty_dir + "src/loaders/external_webp"]) + if env["builtin_libwebp"]: + env_thirdparty.Prepend(CPPPATH=["#thirdparty/libwebp/src"]) env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources) env.modules_sources += thirdparty_obj |