[Gzz-commits] libvob src/jni/Main.cxx src/jni/Makefile test/v...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/03/12 04:00:50

Modified files:
        src/jni        : Main.cxx Makefile 
        test/vob/gl    : glvobcoorder.test 
Added files:
        src/jni        : Transform.cxx 

Log message:
        Working towards gl

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Transform.cxx?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Main.cxx.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Makefile.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/gl/glvobcoorder.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: libvob/src/jni/Main.cxx
diff -u libvob/src/jni/Main.cxx:1.7 libvob/src/jni/Main.cxx:1.8
--- libvob/src/jni/Main.cxx:1.7 Tue Mar 11 07:57:04 2003
+++ libvob/src/jni/Main.cxx     Wed Mar 12 04:00:50 2003
@@ -35,6 +35,7 @@
 #include <vob/Debug.hxx>
 
 #include "org_nongnu_libvob_gl_GL.h"
+#include "vobjnidef.hxx"
 
 namespace Vob {
 namespace JNI {
@@ -233,7 +234,6 @@
 
 extern "C" {
 
-#define jf(t, rootname) JNIEXPORT t JNICALL 
Java_org_nongnu_libvob_gl_GL_##rootname
 
 jf(jint, init)
   (JNIEnv *env, jclass, jint) {
Index: libvob/src/jni/Makefile
diff -u libvob/src/jni/Makefile:1.9 libvob/src/jni/Makefile:1.10
--- libvob/src/jni/Makefile:1.9 Tue Mar 11 07:57:04 2003
+++ libvob/src/jni/Makefile     Wed Mar 12 04:00:50 2003
@@ -1,6 +1,6 @@
 include ../../rules.mk
 
-sources = Gen.cxx GLRen.gen.cxx Main.cxx Strings.cxx
+sources = Gen.cxx GLRen.gen.cxx Main.cxx Strings.cxx Transform.cxx
 
 CALLGL=../../../callgl
 CALLGLOBJS=$(CALLGL)/src/glwrapper/GL_wrapper.o $(CALLGL)/src/callgl.o
@@ -9,7 +9,7 @@
 TEXTUREOBJS=../texture/Texture.o ../texture/Texture_pipetexture.o 
 UTILOBJS=../util/Perlin.o ../util/buildmipmaps.o ../util/Debug.o
 
-JNIOBJS=GLRen.gen.o Main.o Strings.o $(OSOBJS) $(TEXTUREOBJS) $(UTILOBJS) 
$(CALLGLOBJS)
+JNIOBJS=GLRen.gen.o Main.o Strings.o Transform.cxx $(OSOBJS) $(TEXTUREOBJS) 
$(UTILOBJS) $(CALLGLOBJS)
 
 EXTRAINCLUDE=-I${JAVAHOME}/include -I${JAVAHOME}/include/linux 
 
Index: libvob/test/vob/gl/glvobcoorder.test
diff -u libvob/test/vob/gl/glvobcoorder.test:1.2 
libvob/test/vob/gl/glvobcoorder.test:1.3
--- libvob/test/vob/gl/glvobcoorder.test:1.2    Tue Mar 11 09:01:27 2003
+++ libvob/test/vob/gl/glvobcoorder.test        Wed Mar 12 04:00:50 2003
@@ -257,6 +257,11 @@
 
 
 def testCulling():
+    """Test culling.
+    FAILURE: Fonts...
+
+    fail: *
+    """
 
     def putThings():
        vs.map.clear()