diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-28 13:29:52 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-28 14:07:39 +0200 |
commit | 3a2ca68af3c8bafe9f60f09bd8fece894fe3a925 (patch) | |
tree | c33aa8ccee82b26d868fbc91abed94e2480864c2 /drivers/gl_context | |
parent | 243bdc4524ddcf8ac6bef03c378e14fe7bb263b8 (diff) |
SCons: Build thirdparty code in own env, disable warnings
Also remove unnecessary `Export('env')` in other SCsubs,
Export should only be used when exporting *new* objects.
Diffstat (limited to 'drivers/gl_context')
-rw-r--r-- | drivers/gl_context/SCsub | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gl_context/SCsub b/drivers/gl_context/SCsub index 4d66a9f9f1..efb26a7908 100644 --- a/drivers/gl_context/SCsub +++ b/drivers/gl_context/SCsub @@ -10,13 +10,14 @@ if (env["platform"] in ["haiku", "osx", "windows", "x11"]): ] thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] - env.add_source_files(env.drivers_sources, thirdparty_sources) env.Append(CPPPATH=[thirdparty_dir]) env.Append(CPPFLAGS=['-DGLAD_ENABLED']) env.Append(CPPFLAGS=['-DGLES_OVER_GL']) + env_thirdparty = env.Clone() + env_thirdparty.disable_warnings() + env_thirdparty.add_source_files(env.drivers_sources, thirdparty_sources) + # Godot source files env.add_source_files(env.drivers_sources, "*.cpp") - -Export('env') |