godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move glad files to thirdparty dir

This commit is contained in:
Rémi Verschelde 2017-01-06 22:41:51 +01:00
parent 55b601d62b
commit dc0d08cc93
7 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gl_context/SCsub
View File

@ -3,28 +3,18 @@
Import('env') Import('env')
if (env["platform"] in ["haiku", "osx", "windows", "x11"]): if (env["platform"] in ["haiku", "osx", "windows", "x11"]):
# FIXME: Dead code, now using GLAD
"""
# Thirdparty source files # Thirdparty source files
if (env['builtin_glew'] != 'no'): # builtin thirdparty_dir = "#thirdparty/glad/"
thirdparty_dir = "#thirdparty/glew/"
thirdparty_sources = [ thirdparty_sources = [
"glew.c", "glad.c",
] ]
thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
env.add_source_files(env.drivers_sources, thirdparty_sources) env.add_source_files(env.drivers_sources, thirdparty_sources)
env.Append(CPPFLAGS=['-DGLEW_STATIC'])
env.Append(CPPPATH=[thirdparty_dir]) env.Append(CPPPATH=[thirdparty_dir])
env.Append(CPPFLAGS=['-DGLEW_ENABLED']) env.Append(CPPFLAGS=['-DGLAD_ENABLED'])
""" env.Append(CPPFLAGS=['-DGLES_OVER_GL'])
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 # Godot source files
env.add_source_files(env.drivers_sources, "*.cpp") env.add_source_files(env.drivers_sources, "*.cpp")

4
platform/osx/platform_config.h
View File

@ -28,7 +28,5 @@
/*************************************************************************/ /*************************************************************************/
#include <alloca.h> #include <alloca.h>
//#define GLES2_INCLUDE_H "GL/glew.h" #define GLES3_INCLUDE_H "glad/glad.h"
//#define GLES3_INCLUDE_H "GL/glew.h"
#define GLES3_INCLUDE_H "gl_context/glad/glad.h"
#define PTHREAD_RENAME_SELF #define PTHREAD_RENAME_SELF

3
platform/windows/platform_config.h
View File

@ -30,5 +30,4 @@
//#else //#else
//#include <alloca.h> //#include <alloca.h>
//#endif //#endif
//#define GLES2_INCLUDE_H "GL/glew.h" #define GLES3_INCLUDE_H "glad/glad.h"
#define GLES3_INCLUDE_H "gl_context/glad/glad.h"

4
platform/x11/platform_config.h
View File

@ -34,6 +34,4 @@
#define PTHREAD_BSD_SET_NAME #define PTHREAD_BSD_SET_NAME
#endif #endif
#define GLES2_INCLUDE_H "GL/glew.h" #define GLES3_INCLUDE_H "glad/glad.h"
//#define GLES3_INCLUDE_H "GL/glew.h"
#define GLES3_INCLUDE_H "gl_context/glad/glad.h"

0
drivers/gl_context/KHR/khrplatform.h → thirdparty/glad/KHR/khrplatform.h vendored
View File

0
drivers/gl_context/glad.c → thirdparty/glad/glad.c vendored
View File

2
drivers/gl_context/glad/glad.h → thirdparty/glad/glad/glad.h vendored
View File

@ -85,7 +85,7 @@ GLAPI int gladLoadGL(void);
GLAPI int gladLoadGLLoader(GLADloadproc); GLAPI int gladLoadGLLoader(GLADloadproc);
#include <stddef.h> #include <stddef.h>
#include <gl_context/KHR/khrplatform.h> #include <KHR/khrplatform.h>
#ifndef GLEXT_64_TYPES_DEFINED #ifndef GLEXT_64_TYPES_DEFINED
/* This code block is duplicated in glxext.h, so must be protected */ /* This code block is duplicated in glxext.h, so must be protected */
#define GLEXT_64_TYPES_DEFINED #define GLEXT_64_TYPES_DEFINED