diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2023-09-18 14:49:04 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-09-26 22:43:44 +0200 |
commit | 81949c2cd23e07db9a078b2206b3e43847e051b9 (patch) | |
tree | fc5f074b9563de0b2fc49fc338a39e863040b6c6 /modules/text_server_adv | |
parent | b905959f4382020b424fa093c380e163a7a7f404 (diff) | |
download | redot-engine-81949c2cd23e07db9a078b2206b3e43847e051b9.tar.gz |
thorvg: Update to 0.10.7
Fixes #81618.
Diffstat (limited to 'modules/text_server_adv')
-rw-r--r-- | modules/text_server_adv/SCsub | 4 | ||||
-rw-r--r-- | modules/text_server_adv/gdextension_build/SConstruct | 16 |
2 files changed, 14 insertions, 6 deletions
diff --git a/modules/text_server_adv/SCsub b/modules/text_server_adv/SCsub index 360741363a..1acff68135 100644 --- a/modules/text_server_adv/SCsub +++ b/modules/text_server_adv/SCsub @@ -39,7 +39,9 @@ freetype_enabled = "freetype" in env.module_list msdfgen_enabled = "msdfgen" in env.module_list if "svg" in env.module_list: - env_text_server_adv.Prepend(CPPPATH=["#thirdparty/thorvg/inc", "#thirdparty/thorvg/src/lib"]) + env_text_server_adv.Prepend( + CPPPATH=["#thirdparty/thorvg/inc", "#thirdparty/thorvg/src/lib", "#thirdparty/thorvg/src/utils"] + ) # Enable ThorVG static object linking. env_text_server_adv.Append(CPPDEFINES=["TVG_STATIC"]) diff --git a/modules/text_server_adv/gdextension_build/SConstruct b/modules/text_server_adv/gdextension_build/SConstruct index 38fd5f6403..bf29ad3016 100644 --- a/modules/text_server_adv/gdextension_build/SConstruct +++ b/modules/text_server_adv/gdextension_build/SConstruct @@ -52,23 +52,22 @@ if env["thorvg_enabled"] and env["freetype_enabled"]: "src/lib/sw_engine/tvgSwShape.cpp", "src/lib/sw_engine/tvgSwStroke.cpp", "src/lib/tvgAccessor.cpp", - "src/lib/tvgBezier.cpp", "src/lib/tvgCanvas.cpp", "src/lib/tvgFill.cpp", "src/lib/tvgGlCanvas.cpp", "src/lib/tvgInitializer.cpp", - "src/lib/tvgLinearGradient.cpp", "src/lib/tvgLoader.cpp", - "src/lib/tvgLzw.cpp", "src/lib/tvgPaint.cpp", "src/lib/tvgPicture.cpp", - "src/lib/tvgRadialGradient.cpp", "src/lib/tvgRender.cpp", "src/lib/tvgSaver.cpp", "src/lib/tvgScene.cpp", "src/lib/tvgShape.cpp", "src/lib/tvgSwCanvas.cpp", "src/lib/tvgTaskScheduler.cpp", + "src/utils/tvgBezier.cpp", + "src/utils/tvgCompressor.cpp", + "src/utils/tvgStr.cpp", "src/loaders/raw/tvgRawLoader.cpp", "src/loaders/svg/tvgSvgCssStyle.cpp", "src/loaders/svg/tvgSvgLoader.cpp", @@ -86,6 +85,7 @@ if env["thorvg_enabled"] and env["freetype_enabled"]: "../../../thirdparty/thorvg/src/lib/sw_engine", "../../../thirdparty/thorvg/src/loaders/raw", "../../../thirdparty/thorvg/src/loaders/svg", + "../../../thirdparty/thorvg/src/utils", "../../../thirdparty/libpng", ] ) @@ -93,7 +93,13 @@ if env["thorvg_enabled"] and env["freetype_enabled"]: # Enable ThorVG static object linking. env_tvg.Append(CPPDEFINES=["TVG_STATIC"]) - env.Append(CPPPATH=["../../../thirdparty/thorvg/inc", "../../../thirdparty/thorvg/src/lib"]) + env.Append( + CPPPATH=[ + "../../../thirdparty/thorvg/inc", + "../../../thirdparty/thorvg/src/lib", + "../../../thirdparty/thorvg/src/utils", + ] + ) env.Append(CPPDEFINES=["MODULE_SVG_ENABLED"]) lib = env_tvg.Library( |