godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

(cherry picked from commit 4f9408a0f8)
This commit is contained in:
Fabio Alessandrelli 2019-05-01 18:32:17 +02:00 committed by Rémi Verschelde
parent 20a37529f5
commit 0e6a49a5bc
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/freetype/SCsub
View File

@ -62,13 +62,6 @@ if env['builtin_freetype']:
# Globally too, as freetype is used in scene (see bottom) # Globally too, as freetype is used in scene (see bottom)
env.Append(CCFLAGS=['/FI', '"modules/freetype/uwpdef.h"']) 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.Append(CPPPATH=[thirdparty_dir + "/include"]) env_freetype.Append(CPPPATH=[thirdparty_dir + "/include"])
# Also needed in main env for scene/ # Also needed in main env for scene/
env.Append(CPPPATH=[thirdparty_dir + "/include"]) env.Append(CPPPATH=[thirdparty_dir + "/include"])
@ -81,6 +74,16 @@ if env['builtin_freetype']:
if env['builtin_libpng']: if env['builtin_libpng']:
env_freetype.Append(CPPPATH=["#thirdparty/libpng"]) env_freetype.Append(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 = env_freetype.Clone()
env_thirdparty.disable_warnings() env_thirdparty.disable_warnings()
lib = env_thirdparty.add_library("freetype_builtin", thirdparty_sources) lib = env_thirdparty.add_library("freetype_builtin", thirdparty_sources)