Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
dc0d08cc
Commit
dc0d08cc
authored
Jan 06, 2017
by
Rémi Verschelde
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move glad files to thirdparty dir
parent
55b601d6
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
28 deletions
+13
-28
SCsub
drivers/gl_context/SCsub
+9
-19
platform_config.h
platform/osx/platform_config.h
+1
-3
platform_config.h
platform/windows/platform_config.h
+1
-2
platform_config.h
platform/x11/platform_config.h
+1
-3
khrplatform.h
thirdparty/glad/KHR/khrplatform.h
+0
-0
glad.c
thirdparty/glad/glad.c
+0
-0
glad.h
thirdparty/glad/glad/glad.h
+1
-1
No files found.
drivers/gl_context/SCsub
View file @
dc0d08cc
...
...
@@ -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"
)
...
...
platform/osx/platform_config.h
View file @
dc0d08cc
...
...
@@ -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
platform/windows/platform_config.h
View file @
dc0d08cc
...
...
@@ -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"
platform/x11/platform_config.h
View file @
dc0d08cc
...
...
@@ -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"
drivers/gl_context
/KHR/khrplatform.h
→
thirdparty/glad
/KHR/khrplatform.h
View file @
dc0d08cc
File moved
drivers/gl_context
/glad.c
→
thirdparty/glad
/glad.c
View file @
dc0d08cc
File moved
drivers/gl_context
/glad/glad.h
→
thirdparty/glad
/glad/glad.h
View file @
dc0d08cc
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment