diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-02 19:12:25 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-02 19:12:25 -0300 |
| commit | ce26eb74bca48f16e9a34b4eb1c34e50dfc5daae (patch) | |
| tree | 5f9c387037d0142d40f7275575436483dc0a7237 /drivers/gl_context/SCsub | |
| parent | ab4126f51061277e87b41c48b40e7b54942d4eca (diff) | |
| parent | 45c5c89de961357a7042d9e1f063e288d7a510cf (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'drivers/gl_context/SCsub')
| -rw-r--r-- | drivers/gl_context/SCsub | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/drivers/gl_context/SCsub b/drivers/gl_context/SCsub index cf37e9fe36..a6f9b58ea9 100644 --- a/drivers/gl_context/SCsub +++ b/drivers/gl_context/SCsub @@ -2,20 +2,29 @@ Import('env') -if (env["platform"] in ["haiku","osx","windows","x11"]): - # Thirdparty source files - if (env["glew"] != "system"): # builtin - thirdparty_dir = "#thirdparty/glew/" - thirdparty_sources = [ - "glew.c", - ] - thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] - - env.add_source_files(env.drivers_sources, thirdparty_sources) - env.Append(CPPFLAGS = ['-DGLEW_STATIC']) - env.Append(CPPPATH = [thirdparty_dir]) - - env.Append(CPPFLAGS = ['-DGLEW_ENABLED']) +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", + ] + thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] + + env.add_source_files(env.drivers_sources, thirdparty_sources) + env.Append(CPPFLAGS=['-DGLEW_STATIC']) + 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") |