Added debug support
This commit is contained in:
parent
e78027d295
commit
08e6af2ed0
|
@ -33,7 +33,7 @@
|
||||||
/**
|
/**
|
||||||
* $Id$
|
* $Id$
|
||||||
*
|
*
|
||||||
* Simple test java program.
|
* Simple java test program.
|
||||||
*
|
*
|
||||||
* @author elias_naur <elias_naur@users.sourceforge.net>
|
* @author elias_naur <elias_naur@users.sourceforge.net>
|
||||||
* @version $Revision$
|
* @version $Revision$
|
||||||
|
|
|
@ -42,25 +42,25 @@
|
||||||
GCC = gcc
|
GCC = gcc
|
||||||
LINK = gcc
|
LINK = gcc
|
||||||
JAVAHOME=/usr/java/j2sdk1.4.1_01
|
JAVAHOME=/usr/java/j2sdk1.4.1_01
|
||||||
JAVAC=$(JAVAHOME)/bin/javac
|
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
|
||||||
JAVAH=$(JAVAHOME)/bin/javah
|
DEBUG_FLAGS=-D_DEBUG
|
||||||
CP=../../java
|
LINKOPTS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lGL -lGLU
|
||||||
JAVAFILES=$(shell find ../../java -name \*.java -print|grep -v CVS)
|
|
||||||
CLASSFILES=$(JAVAFILES:.java=.class)
|
|
||||||
|
|
||||||
all: liblwjgl.so
|
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/
|
||||||
|
|
||||||
|
liblwjgl.so: $(LIBOBJS)
|
||||||
|
$(LINK) -shared -o $@ $^ $(LINKOPTS)
|
||||||
cp $@ ../../../bin/
|
cp $@ ../../../bin/
|
||||||
|
|
||||||
.SUFFIXES: .cpp .so .o .java .h .class
|
.SUFFIXES: .cpp .so .o .java .h .class
|
||||||
|
|
||||||
%.class: %.java
|
|
||||||
$(JAVAC) -deprecation -O -source 1.4 -classpath $(CP) $<
|
|
||||||
|
|
||||||
%.o : %.c
|
%.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
|
testprog : main.o
|
||||||
$(LINK) -o $@ $< -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lGL -lGLU
|
$(LINK) -o $@ $< -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lGL -lGLU
|
||||||
|
|
|
@ -0,0 +1,34 @@
|
||||||
|
/*
|
||||||
|
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_ */
|
Loading…
Reference in New Issue