diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-01 10:59:03 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-01 11:59:22 +0200 |
| commit | 6bfb7944d9a1639042ba23fd0ff9950fff9464dd (patch) | |
| tree | 1c2c5e8253a7ed84cee097a1390bd0d8e53bbe75 /modules/svg/SCsub | |
| parent | c51caa3dbdf4acaa7e063c46ae8026adb0633008 (diff) | |
SCons: Remove avoidable defines from main env's CPPPATH
Also finally move freetype to its own env and disable warnings for it.
Still needs some work to fix the awkward situation of the freetype and
svg modules used in scene/ and editor/ respectively.
Diffstat (limited to 'modules/svg/SCsub')
| -rw-r--r-- | modules/svg/SCsub | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/modules/svg/SCsub b/modules/svg/SCsub index d14191056f..22f0b1e3eb 100644 --- a/modules/svg/SCsub +++ b/modules/svg/SCsub @@ -1,6 +1,9 @@ #!/usr/bin/env python Import('env') +Import('env_modules') + +env_svg = env_modules.Clone() # Thirdparty source files thirdparty_dir = "#thirdparty/nanosvg/" @@ -9,12 +12,15 @@ thirdparty_sources = [ ] thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] +env_svg.Append(CPPPATH=[thirdparty_dir]) +# FIXME: Needed in editor/editor_themes.cpp for now, but ideally there +# shouldn't be a dependency on modules/ and its own 3rd party deps. env.Append(CPPPATH=[thirdparty_dir]) env.Append(CCFLAGS=["-DSVG_ENABLED"]) -env_thirdparty = env.Clone() +env_thirdparty = env_svg.Clone() env_thirdparty.disable_warnings() env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources) # Godot's own source files -env.add_source_files(env.modules_sources, "*.cpp") +env_svg.add_source_files(env.modules_sources, "*.cpp") |