godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

thorvg: Disable webp loader if corresponding module is disabled 

Fixes #91873.
This commit is contained in:
Rémi Verschelde 2024-05-13 12:55:21 +02:00
parent c6f1f614bb
commit 831ebda806
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/svg/SCsub
View File

@ -26,7 +26,6 @@ thirdparty_sources = [
"src/loaders/raw/tvgRawLoader.cpp", "src/loaders/raw/tvgRawLoader.cpp",
# image loaders # image loaders
"src/loaders/external_png/tvgPngLoader.cpp", "src/loaders/external_png/tvgPngLoader.cpp",
"src/loaders/external_webp/tvgWebpLoader.cpp",
"src/loaders/jpg/tvgJpgd.cpp", "src/loaders/jpg/tvgJpgd.cpp",
"src/loaders/jpg/tvgJpgLoader.cpp", "src/loaders/jpg/tvgJpgLoader.cpp",
# renderer common # renderer common
@ -59,6 +58,10 @@ thirdparty_sources = [
"src/renderer/sw_engine/tvgSwStroke.cpp", "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] thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
env_svg.Prepend(CPPPATH=[thirdparty_dir + "inc"]) env_svg.Prepend(CPPPATH=[thirdparty_dir + "inc"])
@ -76,12 +79,15 @@ env_thirdparty.Prepend(
thirdparty_dir + "src/renderer/sw_engine", thirdparty_dir + "src/renderer/sw_engine",
thirdparty_dir + "src/loaders/raw", thirdparty_dir + "src/loaders/raw",
thirdparty_dir + "src/loaders/external_png", thirdparty_dir + "src/loaders/external_png",
thirdparty_dir + "src/loaders/external_webp",
thirdparty_dir + "src/loaders/jpg", 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_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
env.modules_sources += thirdparty_obj env.modules_sources += thirdparty_obj

4
thirdparty/thorvg/inc/config.h vendored
View File

@ -5,9 +5,11 @@
#define THORVG_SVG_LOADER_SUPPORT #define THORVG_SVG_LOADER_SUPPORT
#define THORVG_PNG_LOADER_SUPPORT #define THORVG_PNG_LOADER_SUPPORT
#define THORVG_JPG_LOADER_SUPPORT #define THORVG_JPG_LOADER_SUPPORT
#define THORVG_WEBP_LOADER_SUPPORT
#define THORVG_THREAD_SUPPORT #define THORVG_THREAD_SUPPORT
// Added conditionally if webp module is enabled.
//#define THORVG_WEBP_LOADER_SUPPORT
// For internal debugging: // For internal debugging:
//#define THORVG_LOG_ENABLED //#define THORVG_LOG_ENABLED

4
thirdparty/thorvg/update-thorvg.sh vendored
View File

@ -38,9 +38,11 @@ cat << EOF > ../inc/config.h
#define THORVG_SVG_LOADER_SUPPORT #define THORVG_SVG_LOADER_SUPPORT
#define THORVG_PNG_LOADER_SUPPORT #define THORVG_PNG_LOADER_SUPPORT
#define THORVG_JPG_LOADER_SUPPORT #define THORVG_JPG_LOADER_SUPPORT
#define THORVG_WEBP_LOADER_SUPPORT
#define THORVG_THREAD_SUPPORT #define THORVG_THREAD_SUPPORT
// Added conditionally if webp module is enabled.
//#define THORVG_WEBP_LOADER_SUPPORT
// For internal debugging: // For internal debugging:
//#define THORVG_LOG_ENABLED //#define THORVG_LOG_ENABLED