Hi Trevor, On 29 Dec 2006, at 10:25, Trevor Harmon wrote:
> Works as well as the last revision on my MacBook Pro with Apple's > X11 (version 1.1.3). > .... > Any changes you make are fine by me. Given what you write, I'll hesitate now to commit the changes (even if independently of the rest they might be a slightly better build) , afraid of "tampering with evidence" ... Indeed, I can't reconcile your implying that the previous version built fine for you with Apple's X11, and Matthias's experience of the contrary... I've no idea what's in Apple's headers _ please look _, but to remind the problem (in dlls/wined3d/arb_program_shader.c) was the following: > gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include > -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing - > gstabs+ -Wdeclaration-after-statement -Wwrite-strings -Wpointer- > arith -DDBUS_API_SUBJECT_TO_CHANGE -I/sw/include/mesa -g -O2 -o > arb_program_shader.o arb_program_shader.c > .... > In file included from wined3d_private.h:44, > from arb_program_shader.c:33: > ../../include/wine/wined3d_gl.h:1194: error: redefinition of > typedef 'GLchar' > /usr/X11R6/include/GL/gl.h:152: error: previous declaration of > 'GLchar' was here Now include/wine/wined3d_gl.h includes itself (/usr/X11R6/include/)GL/ gl.h (subject to: #ifdef HAVE_OPENGL ... #endif) Then: #ifndef GL_VERSION_2_0 #define GL_VERSION_2_0 1 typedef char GLchar; #endif "GL_VERSION_2_0" is not to be found elsewhere in the builddir, nor in /usr/X11R6, /usr/include or /sw/include (except for mesa/GL/glext.h, SDL/SDL_opengl.h, and vtk-5.0/vtkgl.h). So it is clear why there is no problem when building with xorg _ there is no typedef for GLchar in /usr/X11 _, nor with mesa _ this has a "typedef char GLchar" in GL/glext.h, but defines GL_VERSION_2_0 in the same header file. In xorg's GL, the only occurences of GL_VERSION are for versions 1.1 to 1.5, so I expect that in xfree86 or in Apple's X11 the version numbers are no higher, and GL_VERSION_2_0 shouldn't be defined... And Matthias's error message shows his /usr/X11R6/include/GL/gl.h declares GLchar on line 152, which explains the problem on his installation. But, Trevor, can you clarify why things nevertheless work on your system and not on Matthias's ? Do you have a typedef for GLchar in /usr/X11R6/include/GL/gl.h ? Matthias : did you also have version 1.1.3 of Apple's X11 ? JF Mertens ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ Fink-users mailing list Fink-users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-users
