Fix build with old Mesa3D. r378494 fixed new Mesa3D but it broke old ones.
This commit is contained in:
@@ -1,11 +1,13 @@
|
||||
--- j3d-core/src/native/ogl/gldefs.h.orig 2008-02-28 15:18:01.000000000 -0500
|
||||
+++ j3d-core/src/native/ogl/gldefs.h 2015-02-05 16:38:10.813942000 -0500
|
||||
@@ -65,6 +65,8 @@
|
||||
+++ j3d-core/src/native/ogl/gldefs.h 2015-02-20 17:51:50.420236000 -0500
|
||||
@@ -65,6 +65,10 @@
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
|
||||
+typedef ptrdiff_t GLsizeiptr;
|
||||
+#define GL_VERSION_1_5_TYPES_DEFINED
|
||||
+typedef ptrdiff_t GLintptr;
|
||||
+typedef ptrdiff_t GLsizeiptr;
|
||||
+
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glx.h>
|
||||
#ifdef Java3D_undef__glext_h_
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
--- j3d-core/src/native/ogl/glext.h.orig 2007-02-26 13:37:09.000000000 -0500
|
||||
+++ j3d-core/src/native/ogl/glext.h 2015-02-20 17:50:53.517494000 -0500
|
||||
@@ -3389,10 +3389,12 @@
|
||||
#endif
|
||||
|
||||
#ifndef GL_VERSION_1_5
|
||||
+#ifndef GL_VERSION_1_5_TYPES_DEFINED
|
||||
/* GL types for handling large vertex buffer objects */
|
||||
typedef ptrdiff_t GLintptr;
|
||||
typedef ptrdiff_t GLsizeiptr;
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
#ifndef GL_ARB_vertex_buffer_object
|
||||
/* GL types for handling large vertex buffer objects */
|
||||
Reference in New Issue
Block a user