summaryrefslogtreecommitdiff
path: root/drivers/gl_context/SCsub
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-01-06 22:41:51 +0100
committerRémi Verschelde <rverschelde@gmail.com>2017-01-06 22:42:19 +0100
commitdc0d08cc9379abc190788fb494b798074b64134c (patch)
tree52cb417345cfc8474d92d79c5962b7b8a7de2442 /drivers/gl_context/SCsub
parent55b601d62be967dae841d7d88c1c1d8aa3754e4e (diff)
Move glad files to thirdparty dir
Diffstat (limited to 'drivers/gl_context/SCsub')
-rw-r--r--drivers/gl_context/SCsub28
1 files changed, 9 insertions, 19 deletions
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")