diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-02 21:38:20 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-02 21:52:26 +0100 |
| commit | 3f3f5a5359973e95e94148676a9793d6f52468f3 (patch) | |
| tree | 65adf17c3d3f8d3a83bec29f51142fe884e942d8 /SConstruct | |
| parent | db46a344180d4eae1455e97e22bf84c9c304be7c (diff) | |
| parent | 2820b2d82b2ed747011e37c543aefc6d4d4edee9 (diff) | |
Merge remote-tracking branch 'origin/gles3' into gles3-on-master
Various merge conflicts have been fixed manually and some mistakes
might have been made - time will tell :)
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct index 04c648c283..9a28926c6b 100644 --- a/SConstruct +++ b/SConstruct @@ -348,6 +348,9 @@ if selected_platform in platform_list: if (env['verbose'] == 'no'): methods.no_verbose(sys, env) + + if (True): # FIXME: detect GLES3 + env.Append( BUILDERS = { 'GLES3_GLSL' : env.Builder(action = methods.build_gles3_headers, suffix = 'glsl.h',src_suffix = '.glsl') } ) Export('env') |