[Gzz-commits] gzz/gfx rules.mk Makefile

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   02/10/01 05:15:01

Modified files:
        gfx            : rules.mk Makefile 

Log message:
        BIG commit - probably makes your system broken.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/rules.mk.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/Makefile.diff?tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: gzz/gfx/Makefile
diff -c gzz/gfx/Makefile:1.13 gzz/gfx/Makefile:1.14
*** gzz/gfx/Makefile:1.13       Mon Sep 30 04:15:42 2002
--- gzz/gfx/Makefile    Tue Oct  1 05:15:01 2002
***************
*** 6,14 ****
  JAVAC=javac
  JAVA=java
  
! SUBDIRS=libutil libtexture libmosaic libtext libpaper libcolor libcoords 
librenderables libcallgl jni
  
! JNIOBJS=jni/GzzGL-jni.o jni/paper-jni.o libcallgl/callgl.o libcolor/spaces.o 
libmosaic/Mosaic.o libos/Os-GLX.o libpaper/Paper.o librenderables/Renderables.o 
libtext/Text.o libtexture/Texture.o libtexture/Texture_pipetexture.o 
libutil/buildmipmaps.o libutil/perlin.o libcallgl/GL_kludge.o 
libcoords/Coords.o libutil/Debug.o 
  
  
  
--- 6,14 ----
  JAVAC=javac
  JAVA=java
  
! SUBDIRS=libutil libtexture libmosaic libtext libpaper libcolor libcoords 
librenderables libcallgl libglwrapper jni
  
! JNIOBJS=jni/GzzGL-jni.o jni/paper-jni.o libcallgl/callgl.o libcolor/spaces.o 
libmosaic/Mosaic.o libos/Os-GLX.o libpaper/Paper.o librenderables/Renderables.o 
libtext/Text.o libtexture/Texture.o libtexture/Texture_pipetexture.o 
libutil/buildmipmaps.o libutil/perlin.o libglwrapper/GL_wrapper.o 
libcoords/Coords.o libutil/Debug.o 
  
  
  
Index: gzz/gfx/rules.mk
diff -c gzz/gfx/rules.mk:1.8 gzz/gfx/rules.mk:1.9
*** gzz/gfx/rules.mk:1.8        Mon Sep 30 18:20:28 2002
--- gzz/gfx/rules.mk    Tue Oct  1 05:15:01 2002
***************
*** 21,27 ****
  NVIDIAH = /usr/share/doc/nvidia-glx-dev/include
  
  
! CPPFLAGS = -I/usr/include/freetype2 -I$(NVIDIAH) $(JNIINC) `gdk-pixbuf-config 
--cflags` -I../ -I.
  CXXFLAGS = -g -Wall $(OPTIMIZE) $(CPPFLAGS)
  CCFLAGS = -g -Wall
  
--- 21,27 ----
  NVIDIAH = /usr/share/doc/nvidia-glx-dev/include
  
  
! CPPFLAGS = -I../libglwrapper/ -I../../libglwrapper/ -I/usr/include/freetype2 
-I$(NVIDIAH) $(JNIINC) `gdk-pixbuf-config --cflags` -I../ -I.
  CXXFLAGS = -g -Wall $(OPTIMIZE) $(CPPFLAGS)
  CCFLAGS = -g -Wall