mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2025-01-26 02:07:26 +00:00
Fix more opengl linkage problems on windows
This commit is contained in:
parent
916c3214d2
commit
21d4b43c29
1 changed files with 4 additions and 17 deletions
21
BBGE/GL/gl.h
21
BBGE/GL/gl.h
|
@ -31,7 +31,10 @@ extern "C" {
|
|||
** the United States.
|
||||
*/
|
||||
|
||||
#ifndef APIENTRY
|
||||
#undef APIENTRY
|
||||
#ifdef _WIN32
|
||||
#define APIENTRY __stdcall
|
||||
#else
|
||||
#define APIENTRY
|
||||
#endif
|
||||
|
||||
|
@ -44,17 +47,6 @@ extern "C" {
|
|||
#undef WINGDIAPI
|
||||
#define WINGDIAPI extern
|
||||
|
||||
|
||||
|
||||
#ifndef GLAPI
|
||||
# ifdef _WIN32
|
||||
# define GLAPI __stdcall
|
||||
# else
|
||||
# define GLAPI
|
||||
# endif
|
||||
# define __DEFINED_GLAPI
|
||||
#endif
|
||||
|
||||
/*************************************************************/
|
||||
|
||||
typedef unsigned int GLenum;
|
||||
|
@ -1628,11 +1620,6 @@ WINGDIAPI void APIENTRY glVertex4sv (const GLshort *v);
|
|||
WINGDIAPI void APIENTRY glVertexPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
|
||||
WINGDIAPI void APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
|
||||
|
||||
#ifdef __DEFINED_GLAPI
|
||||
# undef GLAPI
|
||||
# undef __DEFINED_GLAPI
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue