summaryrefslogtreecommitdiff
path: root/drivers/gl_context
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gl_context')
-rw-r--r--drivers/gl_context/SCsub19
-rw-r--r--drivers/gl_context/context_gl.cpp2
-rw-r--r--drivers/gl_context/context_gl.h2
3 files changed, 11 insertions, 12 deletions
diff --git a/drivers/gl_context/SCsub b/drivers/gl_context/SCsub
index efc925dae4..4d66a9f9f1 100644
--- a/drivers/gl_context/SCsub
+++ b/drivers/gl_context/SCsub
@@ -4,18 +4,17 @@ 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]
+ thirdparty_dir = "#thirdparty/glad/"
+ thirdparty_sources = [
+ "glad.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.add_source_files(env.drivers_sources, thirdparty_sources)
+ env.Append(CPPPATH=[thirdparty_dir])
- env.Append(CPPFLAGS=['-DGLEW_ENABLED'])
+ env.Append(CPPFLAGS=['-DGLAD_ENABLED'])
+ env.Append(CPPFLAGS=['-DGLES_OVER_GL'])
# Godot source files
env.add_source_files(env.drivers_sources, "*.cpp")
diff --git a/drivers/gl_context/context_gl.cpp b/drivers/gl_context/context_gl.cpp
index 3e15783d5f..e99ec93e11 100644
--- a/drivers/gl_context/context_gl.cpp
+++ b/drivers/gl_context/context_gl.cpp
@@ -5,7 +5,7 @@
/* GODOT ENGINE */
/* http://www.godotengine.org */
/*************************************************************************/
-/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
diff --git a/drivers/gl_context/context_gl.h b/drivers/gl_context/context_gl.h
index fd3bbee5de..535b492297 100644
--- a/drivers/gl_context/context_gl.h
+++ b/drivers/gl_context/context_gl.h
@@ -5,7 +5,7 @@
/* GODOT ENGINE */
/* http://www.godotengine.org */
/*************************************************************************/
-/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */