diff options
| author | Kevin Rushforth <[email protected]> | 2005-12-05 21:14:26 +0000 |
|---|---|---|
| committer | Kevin Rushforth <[email protected]> | 2005-12-05 21:14:26 +0000 |
| commit | c6487f83fcbb54bf2a98914094e8813641f017e2 (patch) | |
| tree | 76f207d15ba58d4833bc0c0e46bda458b29bf2ba /src/native/ogl/gldefs.h | |
| parent | 2f6fd6914d73f213b6ff9a8055284605c2998fb9 (diff) | |
Fixed the following issues:
Issue 202: Need to upgrade to latest glext.h header file
Issue 203: System.currentTimeMillis is too inaccurate on Windows for fine-grained timing
git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@475 ba19aa83-45c5-6ac9-afd3-db810772062c
Diffstat (limited to 'src/native/ogl/gldefs.h')
| -rw-r--r-- | src/native/ogl/gldefs.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/src/native/ogl/gldefs.h b/src/native/ogl/gldefs.h index 2e5246f..48d5b33 100644 --- a/src/native/ogl/gldefs.h +++ b/src/native/ogl/gldefs.h @@ -23,6 +23,20 @@ #include <stdlib.h> #include <string.h> +/* + * Before we include gl.h we need to ensure that our versions of the + * wglext.h and glext.h files get loaded, not the platform's versions. + */ +#ifndef __glext_h_ +#define __glext_h_ +#define Java3D_undef__glext_h_ +#endif + +#ifndef __wglext_h_ +#define __wglext_h_ +#define Java3D_undef__wglext_h_ +#endif + #if defined(SOLARIS) || defined(LINUX) #define GLX_GLEXT_PROTOTYPES #define GLX_GLXEXT_PROTOTYPES @@ -31,8 +45,12 @@ #include <limits.h> #include <X11/Xlib.h> #include <X11/Xutil.h> + #include <GL/gl.h> #include <GL/glx.h> +#ifdef Java3D_undef__glext_h_ +#undef __glext_h_ +#endif #include "glext.h" #endif @@ -73,6 +91,12 @@ #ifndef D3D #include <GL/gl.h> +#ifdef Java3D_undef__wglext_h_ +#undef __wglext_h_ +#endif +#ifdef Java3D_undef__glext_h_ +#undef __glext_h_ +#endif #include "wglext.h" #include "glext.h" #endif |