Linux breakage after GLEXT API changes.

[Saya-chan]

I'm sorry for bothering with something like this but the two last git commits as of today seem to have broken building on Linux completely.
I have tried both my distro's own glext.h and the one off the official OpenGL site, but still no worky.

Here is a dump of the relevant compiler errors.

[Graf Zahl]

I'm going to include the headers in the project from now on. They have been broken on Linux for quite some time now and they still haven't been fixed.

[Saya-chan]

I believe a local copy of gl.h will be needed too, apparently.

[Edward-san]

these are the errors I get:

[spoiler]

Code: Select all

In file included from /home/edward-san/zdoom/gzdoom/trunk/src/sdl/hardware.cpp:50:
In file included from /home/edward-san/zdoom/gzdoom/trunk/src/sdl/sdlglvideo.h:7:
In file included from /home/edward-san/zdoom/gzdoom/trunk/src/./gl/system/gl_system.h:77:
/home/edward-san/zdoom/gzdoom/trunk/src/./gl/api/gl_api.h:10:33: error: 
      redefinition of 'glBlendEquation' as different kind of symbol
__EXTERN PFNGLBLENDEQUATIONPROC glBlendEquation;
                                ^
/usr/include/GL/gl.h:1661:23: note: previous definition is here
GLAPI void GLAPIENTRY glBlendEquation( GLenum mode );
                      ^
In file included from /home/edward-san/zdoom/gzdoom/trunk/src/sdl/hardware.cpp:50:
In file included from /home/edward-san/zdoom/gzdoom/trunk/src/sdl/sdlglvideo.h:7:
In file included from /home/edward-san/zdoom/gzdoom/trunk/src/./gl/system/gl_system.h:77:
/home/edward-san/zdoom/gzdoom/trunk/src/./gl/api/gl_api.h:70:33: error: 
      redefinition of 'glActiveTexture' as different kind of symbol
__EXTERN PFNGLACTIVETEXTUREPROC glActiveTexture;
                                ^
/usr/include/GL/gl.h:1853:23: note: previous definition is here
GLAPI void GLAPIENTRY glActiveTexture( GLenum texture );
                      ^
In file included from /home/edward-san/zdoom/gzdoom/trunk/src/sdl/hardware.cpp:50:
In file included from /home/edward-san/zdoom/gzdoom/trunk/src/sdl/sdlglvideo.h:7:
In file included from /home/edward-san/zdoom/gzdoom/trunk/src/./gl/system/gl_system.h:77:
/home/edward-san/zdoom/gzdoom/trunk/src/./gl/api/gl_api.h:71:10: error: unknown
      type name 'PFNGLMULTITEXCOORD2FPROC'
__EXTERN PFNGLMULTITEXCOORD2FPROC glMultiTexCoord2f;
         ^
/home/edward-san/zdoom/gzdoom/trunk/src/./gl/api/gl_api.h:72:10: error: unknown
      type name 'PFNGLMULTITEXCOORD2FVPROC'; did you mean
      'PFNGLMULTITEXCOORD2HNVPROC'?
__EXTERN PFNGLMULTITEXCOORD2FVPROC glMultiTexCoord2fv;
         ^~~~~~~~~~~~~~~~~~~~~~~~~
         PFNGLMULTITEXCOORD2HNVPROC
/usr/include/GL/glext.h:10935:25: note: 'PFNGLMULTITEXCOORD2HNVPROC' declared
      here
typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLha...
                        ^
In file included from /home/edward-san/zdoom/gzdoom/trunk/src/sdl/hardware.cpp:50:
In file included from /home/edward-san/zdoom/gzdoom/trunk/src/sdl/sdlglvideo.h:7:
In file included from /home/edward-san/zdoom/gzdoom/trunk/src/./gl/system/gl_system.h:77:
/home/edward-san/zdoom/gzdoom/trunk/src/./gl/api/gl_api.h:72:36: error: 
      redefinition of 'glMultiTexCoord2fv' as different kind of symbol
__EXTERN PFNGLMULTITEXCOORD2FVPROC glMultiTexCoord2fv;
                                   ^
/usr/include/GL/gl.h:1893:23: note: previous definition is here
GLAPI void GLAPIENTRY glMultiTexCoord2fv( GLenum target, const GLfloat *v );
                      ^
5 errors generated.

[/spoiler]

[Graf Zahl]

I believe a local copy of gl.h will be needed too, apparently.

Unfortunately that's not doable.
Since I can't test I'll need some Linux user to give me a patch.