Updated extgl.h/c and checkGLerror.h

src/native/common/checkGLerror.h

@@ -13,7 +13,7 @@
 #ifdef _DEBUG
 
 #include <jni.h>
-#include <gl/glu.h>
+#include <GL/glu.h>
 
 #define CHECK_GL_ERROR \
 	{ \
@@ -31,4 +31,4 @@
 
 #endif /* _DEBUG */
 
-#endif /* _CHECKGLERROR_H_INCLUDED_ */
+#endif /* _CHECKGLERROR_H_INCLUDED_ */

src/native/linux/Makefile

@@ -42,7 +42,7 @@
 GCC = gcc
 LINK = gcc
 JAVAHOME=/usr/java/j2sdk1.4.1_01
-LIBOBJS=extgl.o org_lwjgl_Display.o org_lwjgl_Sys.o org_lwjgl_opengl_BaseGL.o org_lwjgl_opengl_GL.o org_lwjgl_opengl_CoreGL.o org_lwjgl_input_Keyboard.o org_lwjgl_opengl_GLU.o org_lwjgl_input_Mouse.o
+LIBOBJS=../common/extgl.o org_lwjgl_Display.o org_lwjgl_Sys.o org_lwjgl_opengl_BaseGL.o org_lwjgl_opengl_GL.o org_lwjgl_opengl_CoreGL.o org_lwjgl_input_Keyboard.o org_lwjgl_opengl_GLU.o org_lwjgl_input_Mouse.o
 #DEBUG_FLAGS=-D_DEBUG
 LINKOPTS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lGL -lGLU
 

src/native/linux/checkGLerror.h

@@ -1,34 +0,0 @@
-/*
-	checkGLerror.h
-
-	Author:		C. Prince
-	Created:	8 November 2001
-
-	Error checking for OpenGL bindings
-*/
-
-#ifndef _CHECKGLERROR_H_INCLUDED_
-#define _CHECKGLERROR_H_INCLUDED_
-
-#ifdef _DEBUG
-
-#include <jni.h>
-#include <GL/glu.h>
-
-#define CHECK_GL_ERROR \
-	{ \
-		int err = glGetError(); \
-		if (err != GL_NO_ERROR) { \
-			jclass cls = (*env)->FindClass(env, "org/lwjgl/opengl/OpenGLException"); \
-			(*env)->ThrowNew(env, cls, (const char *)gluErrorString(err)); \
-			(*env)->DeleteLocalRef(env, cls); \
-		} \
-	}
-
-#else
-
-#define CHECK_GL_ERROR
-
-#endif /* _DEBUG */
-
-#endif /* _CHECKGLERROR_H_INCLUDED_ */

src/native/linux/org_lwjgl_opengl_BaseGL.c

@@ -39,7 +39,7 @@
  * @version $Revision$
  */
 
-#include <GL/glx.h>
+#include "extgl.h"
 #include "org_lwjgl_opengl_BaseGL.h"
 
 GLXContext context = NULL; // OpenGL rendering context