[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] libvob/src/jni Main.cxx Makefile
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] libvob/src/jni Main.cxx Makefile |
Date: |
Mon, 17 Mar 2003 05:44:25 -0500 |
CVSROOT: /cvsroot/libvob
Module name: libvob
Changes by: Tuomas J. Lukka <address@hidden> 03/03/17 05:44:25
Modified files:
src/jni : Main.cxx Makefile
Log message:
Oops, incomplete integration of glmosaictext
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Main.cxx.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Makefile.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
Patches:
Index: libvob/src/jni/Main.cxx
diff -u libvob/src/jni/Main.cxx:1.9 libvob/src/jni/Main.cxx:1.10
--- libvob/src/jni/Main.cxx:1.9 Wed Mar 12 08:37:57 2003
+++ libvob/src/jni/Main.cxx Mon Mar 17 05:44:25 2003
@@ -52,6 +52,8 @@
ObjectStorer<ByteVector> bytevectors("bytevectors");
+ObjectStorer<DefaultTextRenderer> textrenderers("Textrenderers");
+
ObjectStorer<Os::RenderingSurface> windows("windows");
Os::Window *defaultWindow; // A kludge
Index: libvob/src/jni/Makefile
diff -u libvob/src/jni/Makefile:1.13 libvob/src/jni/Makefile:1.14
--- libvob/src/jni/Makefile:1.13 Fri Mar 14 09:46:26 2003
+++ libvob/src/jni/Makefile Mon Mar 17 05:44:25 2003
@@ -4,6 +4,9 @@
CALLGL=../../../callgl
CALLGLOBJS=$(CALLGL)/src/glwrapper/GL_wrapper.o $(CALLGL)/src/callgl.o
+GLMOSAICTEXT=../../../glmosaictext
+GLMOSAICTEXTOBJS=$(GLMOSAICTEXT)/src/Text.o $(GLMOSAICTEXT)/src/Mosaic.o
+
OSOBJS=../os/Os-GLX.o
TEXTUREOBJS=../texture/Texture.o ../texture/Texture_pipetexture.o
@@ -13,11 +16,12 @@
MAINOBJS=../main/Renderer.o
-JNIOBJS=GLRen.gen.o Main.o Strings.o Transform.o Render.o $(OSOBJS)
$(TEXTUREOBJS) $(UTILOBJS) $(CALLGLOBJS) $(TRANSOBJS) $(MAINOBJS)
+JNIOBJS=GLRen.gen.o Main.o Strings.o Transform.o Render.o $(OSOBJS)
$(TEXTUREOBJS) $(UTILOBJS) $(CALLGLOBJS) $(TRANSOBJS) $(MAINOBJS)
$(GLMOSAICTEXTOBJS)
+
EXTRAINCLUDE=-I${JAVAHOME}/include -I${JAVAHOME}/include/linux
-LIBS=-lGL -lGLU -lstdc++
+LIBS=-lGL -lGLU -lstdc++ -lfreetype
all: $(sources:.cxx=.o) Gen
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] libvob/src/jni Main.cxx Makefile,
Tuomas J. Lukka <=