diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-03-06 22:05:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-06 22:05:37 +0100 |
| commit | 0251c85a4b752736f712cd53f144c0ae1ce0cd2e (patch) | |
| tree | 7181870012cf871451d678b673b2248ae5430f81 | |
| parent | 1388ff5cbb9a1fbc4952dc71fa7f2bf208d13460 (diff) | |
| parent | 315983c90d55250794931bd819333daa0f2d2fd0 (diff) | |
Merge pull request #17317 from eska014/html5-freetype-simd
Disable FreeType SIMD in HTML5 builds
| -rw-r--r-- | modules/freetype/SCsub | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub index a34a650a4d..8a7c2a773a 100644 --- a/modules/freetype/SCsub +++ b/modules/freetype/SCsub @@ -49,7 +49,6 @@ if env['builtin_freetype']: "src/pshinter/pshinter.c", "src/psnames/psnames.c", "src/raster/raster.c", - "src/sfnt/sfnt.c", "src/smooth/smooth.c", "src/truetype/truetype.c", "src/type1/type1.c", @@ -58,9 +57,18 @@ if env['builtin_freetype']: ] thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] - # Include header for UWP to fix build issues - if "platform" in env and env["platform"] == "uwp": - env.Append(CCFLAGS=['/FI', '"modules/freetype/uwpdef.h"']) + sfnt = thirdparty_dir + 'src/sfnt/sfnt.c' + + if 'platform' in env: + if env['platform'] == 'uwp': + # Include header for UWP to fix build issues + env.Append(CCFLAGS=['/FI', '"modules/freetype/uwpdef.h"']) + elif env['platform'] == 'javascript': + # Forcibly undefine this macro so SIMD is not used in this file, + # since currently unsuported in WASM + sfnt = env.Object(sfnt, CPPFLAGS=['-U__OPTIMIZE__']) + + thirdparty_sources += [sfnt] env.Append(CPPPATH=[thirdparty_dir, thirdparty_dir + "/include"]) |