From: Brian P. <br...@va...> - 2000-07-12 14:45:15
|
Alessandro Pisani wrote: > > Okay, i've put togheter all the fixes needed to make Mesa 3.2 work fine > with MS VC 6.0 . These fixes have 3 (main) goals: > 1) Avoid lots of compile warnings/errors (about 1.1MB of stdout ... ;) > 2) Remove a link error during OPENGL32.DLL creation of the 3dfx/Mesa > 3) Make 3DNOW, MMX, X86 (but also KATMAI for Mesa 3.3) optimizations work > fine for both the normal and the 3dfx versions of Mesa 3.2 > > I've fixed makefiles, rules files and some includes and sources. I've > slightly modified gl/gl.h : now this includes a new mesawin32.h include > file if __WIN32__ is detected. mesawin32.h contains the complete list > (about 25~30 pragmas) of all warning you have to disable in MSVC if you > don't want to become insane during compiling. > (Please note that the disabled-warnings have been tested only on MS-VC 6... > I tried to make the list backward compatible, but I do not know if i > succeeded : i only have the 6.0 version) > > I've prepared a diff file produced with DIFF 2.7.2 (for DOS) (command line > used if diff -uNr dir2/Mesa-3.2 dir1/Mesa-3.2 -- dir2 contained the > ORIGINAL Mesa 3.2 AND Mesa Demos 3.2, dir1 contained my patched version of > both Mesa 3.2 and MesaDemos 3.2). > > I applied the patch with PATCH 2.5.4 (for DOS) with the commandline: patch > -p1 -f < mesa32.diff to a clean-original Mesa3.2 + MesaDemos3.2, then > recompiled all the stuff (static libs, DLLs, Demos, 3dfx demos, > book-samples, ...) via mesaw32.bat and all works fine for me. > > Note for Brian and Mesa 3.2.1: Brian, I'm sorry for breking you work but > please apply this patch insted of files I posted some days ago: i made > other changes on them. I have a few problems with this. 1. You introduce a new include/GL/mesawin32.h header. The headers in include/GL are meant to be public interfaces. Your header just has a bunch of MSVC pragmas for compiling Mesa. This should probably be moved to the src/ directory. 2. When I tried to apply your patch, many of the patches failed since the latest 3.2 CVS files are different from the released 3.2 distro. Can you download the latest files from CVS and try again? 3. It would be best if you used the CVS sources since you could then test/update Mesa 3.3 which will be released soon. -Brian |