[Java-game-lib-cvs] CVS: LWJGL/src/native/linux checkGLerror.h,NONE,1.1 Game.java,1.5,1.6 Makefile,1.2,1.3

[Elias N. <eli...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory usw-pr-cvs1:/tmp/cvs-serv29961

Modified Files:
	Game.java Makefile 
Added Files:
	checkGLerror.h 
Log Message:
Added debug support

--- NEW FILE: checkGLerror.h ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/checkGLerror.h
/*
	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_ */

Index: Game.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/Game.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/Game.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Game.java	17 Nov 2002 16:49:16 -0000	1.5
+++ Game.java	17 Nov 2002 17:09:40 -0000	1.6
@@ -33,7 +33,7 @@
 /**
  * $Id$
  *
- * Simple test java program.
+ * Simple java test program.
  *
  * @author elias_naur <eli...@us...>
  * @version $Revision$

Index: Makefile
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/Makefile
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	15 Nov 2002 11:10:32 -0000	1.2
+++ Makefile	17 Nov 2002 17:09:40 -0000	1.3
@@ -42,25 +42,25 @@
 GCC = gcc
 LINK = gcc
 JAVAHOME=/usr/java/j2sdk1.4.1_01
-JAVAC=$(JAVAHOME)/bin/javac
-JAVAH=$(JAVAHOME)/bin/javah
-CP=../../java
-JAVAFILES=$(shell find ../../java -name \*.java -print|grep -v CVS)
-CLASSFILES=$(JAVAFILES:.java=.class)
+LIBOBJS=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
 
 all: liblwjgl.so
 
-liblwjgl.so: 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
-	$(LINK) -shared -o $@ $^ -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lGL -lGLU
+
+liblwjgl_d.so: $(LIBOBJS)
+	$(LINK) -shared -o $@ $^ $(LINKOPTS)
 	cp $@ ../../../bin/
 
-.SUFFIXES:      .cpp .so .o .java .h .class
+liblwjgl.so: $(LIBOBJS)
+	$(LINK) -shared -o $@ $^ $(LINKOPTS)
+	cp $@ ../../../bin/
 
-%.class: %.java
-	$(JAVAC) -deprecation -O -source 1.4 -classpath $(CP) $<
+.SUFFIXES:      .cpp .so .o .java .h .class
 
 %.o : %.c
-	$(GCC) -Wall -I$(JAVAHOME)/include -I../common -I$(JAVAHOME)/include/linux -c -o $@ $< 
+	$(GCC) $(DEBUG_FLAGS) -Wall -I$(JAVAHOME)/include -I../common -I$(JAVAHOME)/include/linux -c -o $@ $< 
 
 testprog : main.o
 	$(LINK) -o $@ $< -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lGL -lGLU