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 /drivers/gl_context/SCsub | |
| 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 'drivers/gl_context/SCsub')
| -rw-r--r-- | drivers/gl_context/SCsub | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gl_context/SCsub b/drivers/gl_context/SCsub index a968c10cfd..a6f9b58ea9 100644 --- a/drivers/gl_context/SCsub +++ b/drivers/gl_context/SCsub @@ -3,8 +3,11 @@ Import('env') if (env["platform"] in ["haiku", "osx", "windows", "x11"]): + # FIXME: Dead code, now using GLAD + """ # Thirdparty source files if (env['builtin_glew'] != 'no'): # builtin + thirdparty_dir = "#thirdparty/glew/" thirdparty_sources = [ "glew.c", @@ -16,6 +19,12 @@ if (env["platform"] in ["haiku", "osx", "windows", "x11"]): env.Append(CPPPATH=[thirdparty_dir]) env.Append(CPPFLAGS=['-DGLEW_ENABLED']) + """ + + env.add_source_files(env.drivers_sources,"glad.c") + env.Append(CPPFLAGS = ['-DGLAD_ENABLED']) + env.Append(CPPFLAGS = ['-DGLES_OVER_GL']) + env.Append(CPPPATH = ['.']) # Godot source files env.add_source_files(env.drivers_sources, "*.cpp") |