[Gzz-commits] libvob ./Makefile src/jni/Makefile include/vob/...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/03/26 08:15:03

Modified files:
        .              : Makefile 
        src/jni        : Makefile 
Added files:
        include/vob/paper: Paper.hxx 
        org/nongnu/libvob/gl: Paper.java 
        src/jni        : Paper.cxx 
        src/paper      : Paper.cxx 

Log message:
        Port of paper comnpiles

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/Makefile.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/paper/Paper.hxx?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/gl/Paper.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Paper.cxx?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Makefile.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/paper/Paper.cxx?rev=1.1

Patches:
Index: libvob/Makefile
diff -u libvob/Makefile:1.18 libvob/Makefile:1.19
--- libvob/Makefile:1.18        Tue Mar 25 13:23:45 2003
+++ libvob/Makefile     Wed Mar 26 08:15:03 2003
@@ -1,6 +1,6 @@
 include rules.mk
 
-SUBDIRS = ctest src/trans src/util src/texture src/os src/jni src/main
+SUBDIRS = ctest src/trans src/util src/texture src/paper src/os src/jni 
src/main
 
 RAWSRC = `find org/ -name "*.java"` 
 
Index: libvob/src/jni/Makefile
diff -u libvob/src/jni/Makefile:1.16 libvob/src/jni/Makefile:1.17
--- libvob/src/jni/Makefile:1.16        Mon Mar 24 14:03:30 2003
+++ libvob/src/jni/Makefile     Wed Mar 26 08:15:03 2003
@@ -1,13 +1,13 @@
 include ../../rules.mk
 
-sources = Gen.cxx GLRen.gen.cxx Main.cxx Strings.cxx Transform.cxx Render.cxx 
Font.cxx
+sources = Gen.cxx GLRen.gen.cxx Main.cxx Strings.cxx Transform.cxx Render.cxx 
Font.cxx Paper.cxx
 
 CALLGL=../../../callgl
 CALLGLOBJS=$(CALLGL)/src/glwrapper/GL_wrapper.o $(CALLGL)/src/callgl.o
 GLMOSAICTEXT=../../../glmosaictext
 GLMOSAICTEXTOBJS=$(GLMOSAICTEXT)/src/Text.o $(GLMOSAICTEXT)/src/Mosaic.o
 
-
+PAPEROBJS=../paper/Paper.o
 OSOBJS=../os/Os-GLX.o 
 TEXTUREOBJS=../texture/Texture.o ../texture/Texture_pipetexture.o 
 UTILOBJS=../util/Perlin.o ../util/buildmipmaps.o ../util/Debug.o 
../util/ImageLoader.o
@@ -16,7 +16,7 @@
 
 MAINOBJS=../main/Renderer.o
 
-JNIOBJS=GLRen.gen.o Main.o Strings.o Transform.o Render.o Font.o $(OSOBJS) 
$(TEXTUREOBJS) $(UTILOBJS) $(CALLGLOBJS) $(TRANSOBJS) $(MAINOBJS) 
$(GLMOSAICTEXTOBJS)
+JNIOBJS=GLRen.gen.o Main.o Strings.o Transform.o Render.o Font.o Paper.o 
$(OSOBJS) $(TEXTUREOBJS) $(UTILOBJS) $(CALLGLOBJS) $(TRANSOBJS) $(MAINOBJS) 
$(GLMOSAICTEXTOBJS) $(PAPEROBJS)
 
 
 EXTRAINCLUDE=-I${JAVAHOME}/include -I${JAVAHOME}/include/linux 
@@ -47,3 +47,5 @@
        javah -classpath $(CLASSPATH):../../CLASSES org.nongnu.libvob.gl.GL
 org_nongnu_libvob_gl_GLRen.h: ../../CLASSES/org/nongnu/libvob/gl/GLRen.class
        javah -classpath $(CLASSPATH):../../CLASSES org.nongnu.libvob.gl.GLRen
+org_nongnu_libvob_gl_Paper.h: ../../CLASSES/org/nongnu/libvob/gl/Paper.class
+       javah -classpath $(CLASSPATH):../../CLASSES org.nongnu.libvob.gl.Paper