From: Brian P. <br...@pr...> - 2000-05-26 16:00:05
|
Eero Pajarre wrote: > > I compiled the latest CVS sources using the Makefile.fx. > There were problems with mesa_wgl.h and undefined > HGLRC etc. > > glheader.h defines these symbols, but it includes > gl.h (which includes mesa_wgl.h) before defining > them. > > Thus I was able to get rid of these errors by moving > the point where glheader.h includes gl.h to > a latter position in the file: (patch attached in the > end) > > I also #if ed out the #define CALLBACK in glheader.h > because it gave me duplicate definition warnings. > > There were also problems in compiling some > of the subdirectories of src. > In order to fix these I changed: > fxdrv.h, osmesa.c and x86.c > to include glheader.h before including other Mesa headers. I've applied your patch and fixed those 3 files. I'll check them in soon, after I've tested. > With these changes I got the library to compile, but there is > an other problem: When my application code uses <GL/gl.h> > (or even GL/glut.h), I get errors from mesa_wgl.h. > I assume that I could fix these by including windows.h first > but a) I don't want to > b) I thought that especially with glut.h that should not be > needed. > > I am not sure how to fix this, except by placing the > definitions of HGLRC etc back to one of the > GL/*.h files, or including <windows.h> there. As you've seen, I removed a lot of Windows-related stuff from the gl.h header because it doesn't belong there. Sorry for breaking things on Windows. It seems to me that HGLRC stuff should go in mesa_wgl.h. -Brian |