diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-03 18:01:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-03 18:01:22 +0200 |
| commit | a3bdb6c8d83d424da664ea8c4ee680a9b67e1b30 (patch) | |
| tree | 8672de67513b1971abcb9c5fb5b0337ddcf67184 /modules/regex | |
| parent | f5f7244a2b59de60b2c1c29346b2fe5ded2ae2d0 (diff) | |
| parent | b0d41847ed1e4cd9407dce0d26aaa09db656ec12 (diff) | |
| download | redot-engine-a3bdb6c8d83d424da664ea8c4ee680a9b67e1b30.tar.gz | |
Merge pull request #30277 from akien-mga/scons-cppdefines
SCons: Use CPPDEFINES instead of CPPFLAGS for pre-processor defines
Diffstat (limited to 'modules/regex')
| -rw-r--r-- | modules/regex/SCsub | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/regex/SCsub b/modules/regex/SCsub index 65f354ffa7..acbe4a5a01 100644 --- a/modules/regex/SCsub +++ b/modules/regex/SCsub @@ -9,10 +9,10 @@ if env['builtin_pcre2']: jit_blacklist = ['javascript', 'uwp'] thirdparty_dir = '#thirdparty/pcre2/src/' - thirdparty_flags = ['-DPCRE2_STATIC', '-DHAVE_CONFIG_H'] + thirdparty_flags = ['PCRE2_STATIC', 'HAVE_CONFIG_H'] if 'platform' in env and env['platform'] not in jit_blacklist: - thirdparty_flags.append('-DSUPPORT_JIT') + thirdparty_flags.append('SUPPORT_JIT') thirdparty_sources = [ "pcre2_auto_possess.c", @@ -47,17 +47,17 @@ if env['builtin_pcre2']: thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] env_regex.Prepend(CPPPATH=[thirdparty_dir]) - env_regex.Append(CPPFLAGS=thirdparty_flags) + env_regex.Append(CPPDEFINES=thirdparty_flags) def pcre2_builtin(width): env_pcre2 = env_regex.Clone() env_pcre2.disable_warnings() env_pcre2["OBJSUFFIX"] = "_" + width + env_pcre2["OBJSUFFIX"] env_pcre2.add_source_files(env.modules_sources, thirdparty_sources) - env_pcre2.Append(CPPFLAGS=["-DPCRE2_CODE_UNIT_WIDTH=" + width]) + env_pcre2.Append(CPPDEFINES=[("PCRE2_CODE_UNIT_WIDTH", width)]) pcre2_builtin("16") pcre2_builtin("32") -env_regex.Append(CPPFLAGS=["-DPCRE2_CODE_UNIT_WIDTH=0"]) +env_regex.Append(CPPDEFINES=[("PCRE2_CODE_UNIT_WIDTH", 0)]) env_regex.add_source_files(env.modules_sources, "*.cpp") |