diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-08-17 13:33:15 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-08-17 13:40:19 +0200 |
| commit | 5282974c6156e27b73e1a8d6147d1ea1ad06550f (patch) | |
| tree | 6a109110437d8142a0c66c111062279905a5a607 /modules/text_server_fb | |
| parent | 446dfdbd8735742319d5113d481745ee0baba8b2 (diff) | |
| download | redot-engine-5282974c6156e27b73e1a8d6147d1ea1ad06550f.tar.gz | |
SCons: Fix ThorVG build option in TextServers with #80095
Diffstat (limited to 'modules/text_server_fb')
| -rw-r--r-- | modules/text_server_fb/SCsub | 2 | ||||
| -rw-r--r-- | modules/text_server_fb/gdextension_build/SConstruct | 14 |
2 files changed, 6 insertions, 10 deletions
diff --git a/modules/text_server_fb/SCsub b/modules/text_server_fb/SCsub index 582e622147..0da2a54bc2 100644 --- a/modules/text_server_fb/SCsub +++ b/modules/text_server_fb/SCsub @@ -10,6 +10,8 @@ env_text_server_fb = env_modules.Clone() if "svg" in env.module_list: env_text_server_fb.Prepend(CPPPATH=["#thirdparty/thorvg/inc", "#thirdparty/thorvg/src/lib"]) + # Enable ThorVG static object linking. + env_text_server_fb.Append(CPPDEFINES=["TVG_STATIC"]) if env["builtin_msdfgen"] and msdfgen_enabled: # Treat msdfgen headers as system headers to avoid raising warnings. Not supported on MSVC. diff --git a/modules/text_server_fb/gdextension_build/SConstruct b/modules/text_server_fb/gdextension_build/SConstruct index fcf8976019..20e1afa2e5 100644 --- a/modules/text_server_fb/gdextension_build/SConstruct +++ b/modules/text_server_fb/gdextension_build/SConstruct @@ -64,9 +64,6 @@ if env["thorvg_enabled"] and env["freetype_enabled"]: "src/lib/tvgShape.cpp", "src/lib/tvgSwCanvas.cpp", "src/lib/tvgTaskScheduler.cpp", - "src/loaders/external_png/tvgPngLoader.cpp", - "src/loaders/jpg/tvgJpgd.cpp", - "src/loaders/jpg/tvgJpgLoader.cpp", "src/loaders/raw/tvgRawLoader.cpp", "src/loaders/svg/tvgSvgCssStyle.cpp", "src/loaders/svg/tvgSvgLoader.cpp", @@ -74,9 +71,6 @@ if env["thorvg_enabled"] and env["freetype_enabled"]: "src/loaders/svg/tvgSvgSceneBuilder.cpp", "src/loaders/svg/tvgSvgUtil.cpp", "src/loaders/svg/tvgXmlParser.cpp", - "src/loaders/tvg/tvgTvgBinInterpreter.cpp", - "src/loaders/tvg/tvgTvgLoader.cpp", - "src/savers/tvg/tvgTvgSaver.cpp", ] thirdparty_tvg_sources = [thirdparty_tvg_dir + file for file in thirdparty_tvg_sources] @@ -85,15 +79,15 @@ if env["thorvg_enabled"] and env["freetype_enabled"]: "../../../thirdparty/thorvg/inc", "../../../thirdparty/thorvg/src/lib", "../../../thirdparty/thorvg/src/lib/sw_engine", - "../../../thirdparty/thorvg/src/loaders/external_png", - "../../../thirdparty/thorvg/src/loaders/jpg", "../../../thirdparty/thorvg/src/loaders/raw", "../../../thirdparty/thorvg/src/loaders/svg", - "../../../thirdparty/thorvg/src/loaders/tvg", - "../../../thirdparty/thorvg/src/savers/tvg", "../../../thirdparty/libpng", ] ) + + # Enable ThorVG static object linking. + env_tvg.Append(CPPDEFINES=["TVG_STATIC"]) + env.Append(CPPPATH=["../../../thirdparty/thorvg/inc", "../../../thirdparty/thorvg/src/lib"]) env.Append(CPPDEFINES=["MODULE_SVG_ENABLED"]) |