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 /core/SCsub | |
| parent | f5f7244a2b59de60b2c1c29346b2fe5ded2ae2d0 (diff) | |
| parent | b0d41847ed1e4cd9407dce0d26aaa09db656ec12 (diff) | |
Merge pull request #30277 from akien-mga/scons-cppdefines
SCons: Use CPPDEFINES instead of CPPFLAGS for pre-processor defines
Diffstat (limited to 'core/SCsub')
| -rw-r--r-- | core/SCsub | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/SCsub b/core/SCsub index 6389cd176c..bf1b34bebe 100644 --- a/core/SCsub +++ b/core/SCsub @@ -126,10 +126,10 @@ if env['builtin_zstd']: thirdparty_zstd_sources = [thirdparty_zstd_dir + file for file in thirdparty_zstd_sources] env_thirdparty.Prepend(CPPPATH=[thirdparty_zstd_dir, thirdparty_zstd_dir + "common"]) - env_thirdparty.Append(CPPFLAGS="-DZSTD_STATIC_LINKING_ONLY") + env_thirdparty.Append(CPPDEFINES=["ZSTD_STATIC_LINKING_ONLY"]) env.Prepend(CPPPATH=thirdparty_zstd_dir) # Also needed in main env includes will trigger warnings - env.Append(CPPFLAGS="-DZSTD_STATIC_LINKING_ONLY") + env.Append(CPPDEFINES=["ZSTD_STATIC_LINKING_ONLY"]) env_thirdparty.add_source_files(env.core_sources, thirdparty_zstd_sources) |