mirror of
https://github.com/godotengine/godot
synced 2024-09-05 05:58:29 +00:00
Move glad files to thirdparty dir
This commit is contained in:
parent
55b601d62b
commit
dc0d08cc93
|
@ -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")
|
||||
|
|
|
@ -28,7 +28,5 @@
|
|||
/*************************************************************************/
|
||||
#include <alloca.h>
|
||||
|
||||
//#define GLES2_INCLUDE_H "GL/glew.h"
|
||||
//#define GLES3_INCLUDE_H "GL/glew.h"
|
||||
#define GLES3_INCLUDE_H "gl_context/glad/glad.h"
|
||||
#define GLES3_INCLUDE_H "glad/glad.h"
|
||||
#define PTHREAD_RENAME_SELF
|
||||
|
|
|
@ -30,5 +30,4 @@
|
|||
//#else
|
||||
//#include <alloca.h>
|
||||
//#endif
|
||||
//#define GLES2_INCLUDE_H "GL/glew.h"
|
||||
#define GLES3_INCLUDE_H "gl_context/glad/glad.h"
|
||||
#define GLES3_INCLUDE_H "glad/glad.h"
|
||||
|
|
|
@ -34,6 +34,4 @@
|
|||
#define PTHREAD_BSD_SET_NAME
|
||||
#endif
|
||||
|
||||
#define GLES2_INCLUDE_H "GL/glew.h"
|
||||
//#define GLES3_INCLUDE_H "GL/glew.h"
|
||||
#define GLES3_INCLUDE_H "gl_context/glad/glad.h"
|
||||
#define GLES3_INCLUDE_H "glad/glad.h"
|
||||
|
|
|
@ -85,7 +85,7 @@ GLAPI int gladLoadGL(void);
|
|||
GLAPI int gladLoadGLLoader(GLADloadproc);
|
||||
|
||||
#include <stddef.h>
|
||||
#include <gl_context/KHR/khrplatform.h>
|
||||
#include <KHR/khrplatform.h>
|
||||
#ifndef GLEXT_64_TYPES_DEFINED
|
||||
/* This code block is duplicated in glxext.h, so must be protected */
|
||||
#define GLEXT_64_TYPES_DEFINED
|
Loading…
Reference in a new issue