diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-03-28 11:58:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-28 11:58:12 +0200 |
| commit | 01f34495bf261a64a790e6f71a14a445fc3f474c (patch) | |
| tree | fbcf900e6020768299b2335561f38d6227faf489 /modules/text_server_fb/SCsub | |
| parent | 795304e34f3f8ab5ee47bfc2ce09ef94cac0a113 (diff) | |
| parent | 40b0634b34efd5ca4f17ef1edf4d18a8edee9819 (diff) | |
Merge pull request #59621 from bruvzg/icu_external
Diffstat (limited to 'modules/text_server_fb/SCsub')
| -rw-r--r-- | modules/text_server_fb/SCsub | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/modules/text_server_fb/SCsub b/modules/text_server_fb/SCsub index 31d1db6167..121f38fcd5 100644 --- a/modules/text_server_fb/SCsub +++ b/modules/text_server_fb/SCsub @@ -4,22 +4,14 @@ Import("env") Import("env_modules") freetype_enabled = env.module_check_dependencies("text_server_fb", ["freetype"], True) -msdngen_enabled = env.module_check_dependencies("text_server_fb", ["msdfgen"], True) +msdfgen_enabled = env.module_check_dependencies("text_server_fb", ["msdfgen"], True) env_text_server_fb = env_modules.Clone() -if msdngen_enabled: - env_text_server_fb.Append( - CPPPATH=[ - "#thirdparty/msdfgen", - ] - ) +if env["builtin_msdfgen"] and msdfgen_enabled: + env_text_server_fb.Append(CPPPATH=["#thirdparty/msdfgen"]) -if freetype_enabled: - env_text_server_fb.Append( - CPPPATH=[ - "#thirdparty/freetype/include", - ] - ) +if env["builtin_freetype"] and freetype_enabled: + env_text_server_fb.Append(CPPPATH=["#thirdparty/freetype/include"]) env_text_server_fb.add_source_files(env.modules_sources, "*.cpp") |