From: Brian P. <br...@va...> - 2001-03-19 16:48:24
|
"Sven M. Hallberg" wrote: > > On Mon, Mar 19, 2001 at 08:13:26AM -0700, Brian Paul wrote: > > "Sven M. Hallberg" wrote: > > > > > > On Fri, Mar 16, 2001 at 06:03:58PM -0700, Brian Paul wrote: > > > > > > > > I've added the SGI SI GLU library code to Mesa CVS. It's in the si-glu/ > > > > directory. You can get it with 'cvs up -d'. > > > > > > > > I've updated the "old-style" makefiles (Makefile.X11 and Make-config) to > > > > compile it. I'd appreciate it if someone would add the autoconfig files > > > > needed to compile it with ./configure;make. > > > > > > Done. However, it didn't compile on my system at first. The problem was that > > > glimports.h, mystdio.h, and mystdlib.h were used in some subdirs of libnurbs > > > while being present only in (multiple!) others. Since the files in the > > > different subdirs were identical I've pulled them all out into si-glu/libnurbs/ > > > itself and added that to the include path in Makefile.X11. That okay, or should > > > they go into one of si-glu/libnurbs' subdirs? > > > > I was hoping that we wouldn't have to change any of the sources. That > > makes it hard to stay synchronized with the OpenGL SI CVS tree. The SI > > GLU compiled fine for me without any changes. Why can't we do the same > > thing with autoconfig? > > Oh, I wasn't aware there even was a SI CVS tree we're synchronized with. Sorry > about that, will revert to the old style. However I believe it _is_ sort of > ugly to have these files duplicated in some dirs. Maybe we should ask the SI > people about it, my guess would be that they'd agree and change it themselves. > :) For now, I'll revert the change and modify the Makefile templates to > find the files, which is of course possible (after all just a matter of an -I). > > I take it the si-glu dir is a direct copy of the SI CVS tree? In that case I'll > try giving it it's very own configure script and calling that from the > top-level configure. That way the mechanism could even be incorporated into > the SI itself. > > I'll look for the SI myself, but can you give me an email address just in case? > I'd like to contact them about the above two issues. See http://oss.sgi.com/projects/ogl-sample/ From the SI CVS tree, I basically copied the contents of ogl-sample/main/gfx/lib/glu/ > > > > The SI GLU requires C++ to compile it. This may be a problem on some > > > > systems. I guess I'll continue to include the old src-glu/ code for > > > > the sake of those systems. > > > > > > I've made configure.in so it checks for a C++ compiler and uses si-glu if it > > > finds one, src-glu otherwise. Should I add a configure switch to specifically > > > enable/disable it, too? > > > > Doesn't matter to me. > > Okay, I'll leave it out because I guess the SI is supposed to replace the Mesa > GLU if possible right? Right. The only reason people should use the old GLU code is if they don't have a C++ compiler. -Brian |