From: Brandon E. <azv...@ya...> - 2001-01-19 22:22:26
|
I found a couple of problems with CVS as-is the Makefile.in files are all auto-generated from the Makefile.am files the Makefile files are all auto-generated from the Makefile.in neither of these Makefile.in or Makefile should be in CVS the configure.in file needs to be in CVS the *.MSH files need to be *.msh as the filesystem under unix machines is case sensitive Here are the diffs from the files I had to fix the first is easy the second has a problem where your fclose'ing an already closed file and lastly I added support to exTexture to tell whether a bmp is RGBA or RGB I tried to fix these issues in CVS, but my access is not working Index: 3dmesh/MathLib.cpp =================================================================== RCS file: /cvsroot/expression/expression/3dmesh/MathLib.cpp,v retrieving revision 1.4 diff -r1.4 MathLib.cpp 36c36 < #ifdef __GNUC__ --- > #ifdef USE_EXPRESSION_NS Index: 3dmesh/actor.cpp =================================================================== RCS file: /cvsroot/expression/expression/3dmesh/actor.cpp,v retrieving revision 1.13 diff -r1.13 actor.cpp 109,110c109,110 < #else if < const int max_path = PATH_MAX --- > #else > const int max_path = PATH_MAX; 303d302 < fclose(stream); Index: 3dmesh/bmptexture.cpp =================================================================== RCS file: /cvsroot/expression/expression/3dmesh/bmptexture.cpp,v retrieving revision 1.4 diff -r1.4 bmptexture.cpp 22a23 > int bytes; 43c44 < 0, GL_RGB, GL_UNSIGNED_BYTE, image->data ); --- > 0, (image->bytes==3)?GL_RGB:GL_RGBA, GL_UNSIGNED_BYTE, image->data ); 92a94 > texture->bytes=3; 122a125 > texture->bytes=4; |