[Gzz-commits] libvob ./rules.mk src/jni/Makefile src/util/Mak...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/03/24 14:03:31

Modified files:
        .              : rules.mk 
        src/jni        : Makefile 
        src/util       : Makefile 
Added files:
        include/vob/util: ImageLoader.hxx 
        src/util       : ImageLoader.cxx 

Log message:
        Imageloading, compilable code

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/rules.mk.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/util/ImageLoader.hxx?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Makefile.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/util/ImageLoader.cxx?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/util/Makefile.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: libvob/rules.mk
diff -u libvob/rules.mk:1.7 libvob/rules.mk:1.8
--- libvob/rules.mk:1.7 Sun Mar 16 12:58:48 2003
+++ libvob/rules.mk     Mon Mar 24 14:03:30 2003
@@ -11,7 +11,7 @@
 # OPTIMIZE =  -O3 -ffast-math $(ARCH) -fomit-frame-pointer 
-foptimize-sibling-calls
 OPTIMIZE = -O0
 
-CPPFLAGS = -I../include -I../../libvob-depends -I../../include $(EXTRAINCLUDE) 
-I../../callgl/include -I../../../callgl/include 
-I../../callgl/include/glwrapper -I../../../callgl/include/glwrapper 
-I../../glmosaictext/include -I../../../glmosaictext/include 
-I/usr/include/freetype2
+CPPFLAGS = -I../include -I../../libvob-depends -I../../include $(EXTRAINCLUDE) 
-I../../callgl/include -I../../../callgl/include 
-I../../callgl/include/glwrapper -I../../../callgl/include/glwrapper 
-I../../glmosaictext/include -I../../../glmosaictext/include 
-I/usr/include/freetype2 `gdk-pixbuf-config --cflags`
 CXXFLAGS = -g -Wall $(OPTIMIZE) $(CPPFLAGS) 
 CCFLAGS = -g -Wall
 
Index: libvob/src/jni/Makefile
diff -u libvob/src/jni/Makefile:1.15 libvob/src/jni/Makefile:1.16
--- libvob/src/jni/Makefile:1.15        Mon Mar 17 07:48:19 2003
+++ libvob/src/jni/Makefile     Mon Mar 24 14:03:30 2003
@@ -10,7 +10,7 @@
 
 OSOBJS=../os/Os-GLX.o 
 TEXTUREOBJS=../texture/Texture.o ../texture/Texture_pipetexture.o 
-UTILOBJS=../util/Perlin.o ../util/buildmipmaps.o ../util/Debug.o
+UTILOBJS=../util/Perlin.o ../util/buildmipmaps.o ../util/Debug.o 
../util/ImageLoader.o
 
 TRANSOBJS=../trans/Transform.o ../trans/Coorder.o
 
@@ -21,7 +21,7 @@
 
 EXTRAINCLUDE=-I${JAVAHOME}/include -I${JAVAHOME}/include/linux 
 
-LIBS=-lGL -lGLU -lstdc++ -lfreetype
+LIBS=-lGL -lGLU -lstdc++ -lfreetype `gdk-pixbuf-config --libs`
 
 all: $(sources:.cxx=.o) Gen 
 
Index: libvob/src/util/Makefile
diff -u libvob/src/util/Makefile:1.2 libvob/src/util/Makefile:1.3
--- libvob/src/util/Makefile:1.2        Tue Mar 11 06:24:29 2003
+++ libvob/src/util/Makefile    Mon Mar 24 14:03:31 2003
@@ -1,6 +1,6 @@
 include ../../rules.mk
 
-sources = Perlin.cxx buildmipmaps.cxx Debug.cxx
+sources = Perlin.cxx buildmipmaps.cxx Debug.cxx ImageLoader.cxx
 
 all: $(sources:.cxx=.o)