diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2019-05-01 18:32:17 +0200 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2019-05-01 18:38:50 +0200 |
| commit | 4f9408a0f8b15d7822057296f932d69a6a4611e2 (patch) | |
| tree | 6ca0e80fd1035357f88440c9d8a228230c77b733 /modules/freetype | |
| parent | 1d9a207dda5e306331e0b8d8b1279da0fcafbf18 (diff) | |
Freetype clone env for no-SMID single file
Fix freetype build issue for javascript platform.
When disabling optimizations (SMID) in specific freetype, source files,
we need to make sure to copy all other CPPFLAGS, not just override them.
Diffstat (limited to 'modules/freetype')
| -rw-r--r-- | modules/freetype/SCsub | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub index 0c8b223a9e..0ea581220e 100644 --- a/modules/freetype/SCsub +++ b/modules/freetype/SCsub @@ -61,13 +61,6 @@ if env['builtin_freetype']: # Globally too, as freetype is used in scene (see bottom) env.Append(CCFLAGS=['/FI', '"modules/freetype/uwpdef.h"']) - sfnt = thirdparty_dir + 'src/sfnt/sfnt.c' - if env['platform'] == 'javascript': - # Forcibly undefine this macro so SIMD is not used in this file, - # since currently unsupported in WASM - sfnt = env_freetype.Object(sfnt, CPPFLAGS=['-U__OPTIMIZE__']) - thirdparty_sources += [sfnt] - env_freetype.Prepend(CPPPATH=[thirdparty_dir + "/include"]) # Also needed in main env for scene/ env.Prepend(CPPPATH=[thirdparty_dir + "/include"]) @@ -80,6 +73,16 @@ if env['builtin_freetype']: if env['builtin_libpng']: env_freetype.Prepend(CPPPATH=["#thirdparty/libpng"]) + sfnt = thirdparty_dir + 'src/sfnt/sfnt.c' + # Must be done after all CPPFLAGS are being set so we can copy them. + if env['platform'] == 'javascript': + # Forcibly undefine this macro so SIMD is not used in this file, + # since currently unsupported in WASM + tmp_env = env_freetype.Clone() + tmp_env.Append(CPPFLAGS=['-U__OPTIMIZE__']) + sfnt = tmp_env.Object(sfnt) + thirdparty_sources += [sfnt] + env_thirdparty = env_freetype.Clone() env_thirdparty.disable_warnings() lib = env_thirdparty.add_library("freetype_builtin", thirdparty_sources) |