From dc0d08cc9379abc190788fb494b798074b64134c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 6 Jan 2017 22:41:51 +0100 Subject: Move glad files to thirdparty dir --- drivers/gl_context/SCsub | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) (limited to 'drivers/gl_context/SCsub') diff --git a/drivers/gl_context/SCsub b/drivers/gl_context/SCsub index a6f9b58ea9..4d66a9f9f1 100644 --- a/drivers/gl_context/SCsub +++ b/drivers/gl_context/SCsub @@ -3,28 +3,18 @@ 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/glad/" + thirdparty_sources = [ + "glad.c", + ] + thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] - 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(CPPPATH=[thirdparty_dir]) - 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 = ['.']) + env.Append(CPPFLAGS=['-DGLAD_ENABLED']) + env.Append(CPPFLAGS=['-DGLES_OVER_GL']) # Godot source files env.add_source_files(env.drivers_sources, "*.cpp") -- cgit v1.2.3