fenfire-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[ff-cvs] libvob include/vob/Debug.hxx src/jni/Makefile-G...


From: Tuomas J. Lukka
Subject: [ff-cvs] libvob include/vob/Debug.hxx src/jni/Makefile-G...
Date: Sun, 17 Aug 2003 12:10:22 -0400

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/17 12:10:22

Modified files:
        include/vob    : Debug.hxx 
        src/jni        : Makefile-Gen 
        src/main       : Renderer.cxx 

Log message:
        Allow glmosaictext debug

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/Debug.hxx.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Makefile-Gen.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/main/Renderer.cxx.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: libvob/include/vob/Debug.hxx
diff -u libvob/include/vob/Debug.hxx:1.3 libvob/include/vob/Debug.hxx:1.4
--- libvob/include/vob/Debug.hxx:1.3    Sun Apr 20 06:24:04 2003
+++ libvob/include/vob/Debug.hxx        Sun Aug 17 12:10:22 2003
@@ -66,7 +66,7 @@
  * @param cname The name of the local variable to be created
  * by the invocation.
  */
-#define DBGVAREXT(cname, name) int cname = Debug::extVar(name, &(cname = 0))
+#define DBGVAREXT(cname, name) int cname##__DBGDUMMY = Debug::extVar(name, 
&cname)
 
 /** A macro that gives an output stream into which it has written
  * the name of the debug variable.
Index: libvob/src/jni/Makefile-Gen
diff -u libvob/src/jni/Makefile-Gen:1.11 libvob/src/jni/Makefile-Gen:1.12
--- libvob/src/jni/Makefile-Gen:1.11    Mon Aug 11 12:39:18 2003
+++ libvob/src/jni/Makefile-Gen Sun Aug 17 12:10:22 2003
@@ -4,6 +4,12 @@
 VOB_OBJS = $(VOBS:%=%.vobgenobj)
 TRANS_OBJS = $(TRANS:%=%.transgenobj)
 
+CALLGL=../../../callgl
+CALLGLOBJS=$(CALLGL)/src/glwrapper/GL_wrapper.o $(CALLGL)/src/callgl.o
+
+GLMOSAICTEXT=../../../glmosaictext
+GLMOSAICTEXTOBJS=$(GLMOSAICTEXT)/src/Text.o $(GLMOSAICTEXT)/src/Mosaic.o
+
 %.vobgenobj: 
        $(CXX) -c $(CXXFLAGS) "-DC_OUTPUT_FILE=src/jni/$*.vobgenjni" 
"-DHEADER_FILE=<vob/vobs/$*.hxx>" -o $@ Generator.cxx
 
@@ -44,7 +50,7 @@
 
 
 Generator: GeneratorMain.o $(VOB_OBJS) $(TRANS_OBJS)
-       $(CXX) -o Generator $(CXXFLAGS) $(EXTRAINCLUDE) GeneratorMain.cxx 
$(VOB_OBJS) $(TRANS_OBJS) ../util/Debug.o ../util/intersect.o 
../trans/Transform.o ../main/Renderer.o $(LIBS)
+       $(CXX) -o Generator $(CXXFLAGS) $(EXTRAINCLUDE) GeneratorMain.cxx 
$(VOB_OBJS) $(TRANS_OBJS) ../util/Debug.o ../util/intersect.o 
../trans/Transform.o ../main/Renderer.o $(CALLGLOBJS) $(GLMOSAICTEXTOBJS) 
$(LIBS)
 
 .PHONY: javahs
 
Index: libvob/src/main/Renderer.cxx
diff -u libvob/src/main/Renderer.cxx:1.12 libvob/src/main/Renderer.cxx:1.13
--- libvob/src/main/Renderer.cxx:1.12   Sat Aug 16 08:20:14 2003
+++ libvob/src/main/Renderer.cxx        Sun Aug 17 12:10:22 2003
@@ -30,11 +30,20 @@
 #include <vob/Renderer.hxx>
 #include <vob/glerr.hxx>
 
+#include <vob/Font.hxx>
+
 
 double getTime() {
   struct timeval t;
   gettimeofday(&t, 0);
   return t.tv_usec*1E-6 + t.tv_sec;
+}
+
+using namespace Vob;
+namespace GLMosaicText {
+    namespace Mosaic {
+       DBGVAREXT(dbg, "GLMosaicText.Mosaic");
+    }
 }
 
 namespace Vob {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]