[Gzz-commits] gzz/gfx Makefile libcallgl/GL_kludge.cxx libcal...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/25 11:34:55

Modified files:
        gfx            : Makefile 
        gfx/libcallgl  : GL_kludge.cxx callgl.cxx 
        gfx/libcoords  : Coords.hxx 
        gfx/libfisheye : Fisheye.hxx 
Added files:
        gfx/libcoords  : Makefile 

Log message:
        Compile here as well

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/Makefile.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcallgl/GL_kludge.cxx.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcallgl/callgl.cxx.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcoords/Makefile?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcoords/Coords.hxx.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libfisheye/Fisheye.hxx.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/gfx/Makefile
diff -c gzz/gfx/Makefile:1.10 gzz/gfx/Makefile:1.11
*** gzz/gfx/Makefile:1.10       Mon Sep 23 14:08:46 2002
--- gzz/gfx/Makefile    Wed Sep 25 11:34:55 2002
***************
*** 6,14 ****
  JAVAC=javac
  JAVA=java
  
! SUBDIRS=libutil libtexture libmosaic libtext libpaper libcolor 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 libutil/Debug.o libcallgl/GL_kludge.o
  
  
  
--- 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 libutil/Debug.o libcallgl/GL_kludge.o 
libcoords/Coords.o
  
  
  
Index: gzz/gfx/libcallgl/GL_kludge.cxx
diff -c gzz/gfx/libcallgl/GL_kludge.cxx:1.3 gzz/gfx/libcallgl/GL_kludge.cxx:1.4
*** gzz/gfx/libcallgl/GL_kludge.cxx:1.3 Mon Sep 23 14:49:53 2002
--- gzz/gfx/libcallgl/GL_kludge.cxx     Wed Sep 25 11:34:55 2002
***************
*** 13,19 ****
  GLenum GL_kludge_error_GLenum(const char * c) {
     std::cerr << "ERROR: from indirect OpenGL call:"
               << c <<" not properly defined by your gfx-driver\n";
!    return NULL;
  }
  GLuint GL_kludge_error_GLuint(const char * c) {
     std::cerr << "ERROR: from indirect OpenGL call:"
--- 13,19 ----
  GLenum GL_kludge_error_GLenum(const char * c) {
     std::cerr << "ERROR: from indirect OpenGL call:"
               << c <<" not properly defined by your gfx-driver\n";
!    return 0;
  }
  GLuint GL_kludge_error_GLuint(const char * c) {
     std::cerr << "ERROR: from indirect OpenGL call:"
Index: gzz/gfx/libcallgl/callgl.cxx
diff -c gzz/gfx/libcallgl/callgl.cxx:1.18 gzz/gfx/libcallgl/callgl.cxx:1.19
*** gzz/gfx/libcallgl/callgl.cxx:1.18   Mon Sep 23 14:08:46 2002
--- gzz/gfx/libcallgl/callgl.cxx        Wed Sep 25 11:34:55 2002
***************
*** 499,505 ****
  
      struct gltoken {
        char *name;
!       int value;
      };
  
      gltoken tokenarr[] = {
--- 499,505 ----
  
      struct gltoken {
        char *name;
!       GLenum value;
      };
  
      gltoken tokenarr[] = {
Index: gzz/gfx/libcoords/Coords.hxx
diff -c gzz/gfx/libcoords/Coords.hxx:1.1 gzz/gfx/libcoords/Coords.hxx:1.2
*** gzz/gfx/libcoords/Coords.hxx:1.1    Wed Sep 25 10:45:43 2002
--- gzz/gfx/libcoords/Coords.hxx        Wed Sep 25 11:34:55 2002
***************
*** 1,3 ****
--- 1,4 ----
+ #include <GL/gl.h>
  #include "libfisheye/Fisheye.hxx"
  
  // XXX homogeneous coordinates for helping texture coordinates
Index: gzz/gfx/libfisheye/Fisheye.hxx
diff -c gzz/gfx/libfisheye/Fisheye.hxx:1.1 gzz/gfx/libfisheye/Fisheye.hxx:1.2
*** gzz/gfx/libfisheye/Fisheye.hxx:1.1  Wed Sep 25 10:45:43 2002
--- gzz/gfx/libfisheye/Fisheye.hxx      Wed Sep 25 11:34:55 2002
***************
*** 1,3 ****
--- 1,5 ----
+ #include "libutil/Vec23.hxx"
+ 
  namespace Fisheye {
  
      using namespace Vec23;
***************
*** 25,30 ****
--- 27,33 ----
  
      //For given z, the magnification range is [ 1, 1 + z ]
      struct scalar_mag_atan {
+       scalar_mag_atan() : mag(1) { }
        scalar_mag_atan(float mag) : mag(mag) { }
        float mag;
        float operator()(float r2) const {