diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2019-04-25 12:22:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-25 12:22:22 +0200 |
commit | 24005bc03d4774afb5a3eb44db25711c3a9cedf1 (patch) | |
tree | fa4d2650672a63b0f4a214c1c6aaff7310eb580c /modules/freetype | |
parent | 7dc7cbea0a576b65562988dee1c143dcc945d369 (diff) | |
parent | c2a669a9f03e249fb4fca96a2adf63256eb8dfa2 (diff) |
Merge pull request #28396 from akien-mga/scons-capture-the-flags
SCons: Review uses of CCFLAGS, CXXFLAGS and CPPFLAGS
Diffstat (limited to 'modules/freetype')
-rw-r--r-- | modules/freetype/SCsub | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub index c2d165f367..f2cd9f9a60 100644 --- a/modules/freetype/SCsub +++ b/modules/freetype/SCsub @@ -72,9 +72,9 @@ if env['builtin_freetype']: # Also needed in main env for scene/ env.Append(CPPPATH=[thirdparty_dir + "/include"]) - env_freetype.Append(CCFLAGS=['-DFT2_BUILD_LIBRARY', '-DFT_CONFIG_OPTION_USE_PNG']) + env_freetype.Append(CPPFLAGS=['-DFT2_BUILD_LIBRARY', '-DFT_CONFIG_OPTION_USE_PNG']) if (env['target'] != 'release'): - env_freetype.Append(CCFLAGS=['-DZLIB_DEBUG']) + env_freetype.Append(CPPFLAGS=['-DZLIB_DEBUG']) # Also requires libpng headers if env['builtin_libpng']: @@ -100,4 +100,4 @@ if env['builtin_freetype']: # Godot source files env_freetype.add_source_files(env.modules_sources, "*.cpp") # Used in scene/, needs to be in main env -env.Append(CCFLAGS=['-DFREETYPE_ENABLED']) +env.Append(CPPFLAGS=['-DFREETYPE_ENABLED']) |