diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-10-25 16:35:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-25 16:35:22 +0200 |
| commit | 3c7cd84a843b5cc870890d128711c7f3d497ddf4 (patch) | |
| tree | 4ea952abe8a3418ceec85f888c341d553e95c941 | |
| parent | b72baf2ca26cad61cd7610283912d6cca4d94dc9 (diff) | |
| parent | 1a0306abb1705ea6741d9f9a2130b0e8b62ddcfb (diff) | |
Merge pull request #33060 from bruvzg/ios_zlib
Fix missing `z_verbose` and `z_error` symbols in the debug iOS build.
| -rw-r--r-- | core/SCsub | 2 | ||||
| -rw-r--r-- | modules/freetype/SCsub | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/SCsub b/core/SCsub index ed9a0a231d..b12c6a9e27 100644 --- a/core/SCsub +++ b/core/SCsub @@ -80,6 +80,8 @@ if env['builtin_zlib']: env_thirdparty.Prepend(CPPPATH=[thirdparty_zlib_dir]) # Needs to be available in main env too env.Prepend(CPPPATH=[thirdparty_zlib_dir]) + if (env['target'] == 'debug'): + env_thirdparty.Append(CPPDEFINES=['ZLIB_DEBUG']) env_thirdparty.add_source_files(env.core_sources, thirdparty_zlib_sources) diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub index b47377cbc4..8f4a8de895 100644 --- a/modules/freetype/SCsub +++ b/modules/freetype/SCsub @@ -66,7 +66,7 @@ if env['builtin_freetype']: env.Prepend(CPPPATH=[thirdparty_dir + "/include"]) env_freetype.Append(CPPDEFINES=['FT2_BUILD_LIBRARY', 'FT_CONFIG_OPTION_USE_PNG']) - if (env['target'] != 'release'): + if (env['target'] == 'debug'): env_freetype.Append(CPPDEFINES=['ZLIB_DEBUG']) # Also requires libpng headers |