diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-10-15 12:39:28 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-10-15 18:10:18 +0200 |
| commit | 248bc9159c0b515e3e276db644744161283881ef (patch) | |
| tree | 88cb5af9ad9382c8643ec810d5d0a9b8370d7e4b /drivers/gl_context/SCsub | |
| parent | edbc0c0d0bed169b3c07ef0f504b97936f0dab37 (diff) | |
drivers: Refactor SCsub and drop redundant env_drivers clone
The reordering of the SConscript includes allows to ensure that
stuff like the builtin zlib headers will be available for libpng.
Also moved glew back into global env, otherwise windows seems
not to find it... Kind of shooting in the dark with this multi-env
setup.
Diffstat (limited to 'drivers/gl_context/SCsub')
| -rw-r--r-- | drivers/gl_context/SCsub | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/gl_context/SCsub b/drivers/gl_context/SCsub index 9a158f0821..b05a96cb99 100644 --- a/drivers/gl_context/SCsub +++ b/drivers/gl_context/SCsub @@ -1,7 +1,4 @@ Import('env') -Import('env_drivers') - -env_glew = env_drivers.Clone() if (env["platform"] in ["haiku","osx","windows","x11"]): # Thirdparty source files @@ -12,15 +9,13 @@ if (env["platform"] in ["haiku","osx","windows","x11"]): ] thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] - env_glew.add_source_files(env.drivers_sources, thirdparty_sources) - env_glew.Append(CPPFLAGS = ['-DGLEW_STATIC']) - env_glew.Append(CPPPATH = [thirdparty_dir]) - # Also pass to global env, used by platform code + env.add_source_files(env.drivers_sources, thirdparty_sources) + env.Append(CPPFLAGS = ['-DGLEW_STATIC']) env.Append(CPPPATH = [thirdparty_dir]) env.Append(CPPFLAGS = ['-DGLEW_ENABLED']) # Godot source files -env_glew.add_source_files(env.drivers_sources, "*.cpp") +env.add_source_files(env.drivers_sources, "*.cpp") Export('env') |