diff --git a/Makefile b/Makefile index 280adec..5d21734 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ #!gmake ## The OpenGL Extension Wrangler Library -## Copyright (C) 2002-2005, Milan Ikits -## Copyright (C) 2002-2005, Marcelo E. Magallon +## Copyright (C) 2002-2006, Milan Ikits +## Copyright (C) 2002-2006, Marcelo E. Magallon ## Copyright (C) 2002, Lev Povalahev ## All rights reserved. ## diff --git a/auto/Makefile b/auto/Makefile index 213aa78..1893d31 100644 --- a/auto/Makefile +++ b/auto/Makefile @@ -1,5 +1,5 @@ -## Copyright (C) 2003-2005, Marcelo E. Magallon -## Copyright (C) 2003-2005, Milan Ikits +## Copyright (C) 2003-2006, Marcelo E. Magallon +## Copyright (C) 2003-2006, Milan Ikits ## ## This program is distributed under the terms and conditions of the GNU ## General Public License Version 2 as published by the Free Software @@ -207,6 +207,7 @@ $(S.DEST)/glew.c: $(EXT)/.dummy cat $(SRC)/glew_str_tail.c >> $@ perl -e "s/GLEW_VERSION_STRING/$(GLEW_VERSION)/g" -pi $@ perl -e "s/GLEW_ARB_vertex_shader = !_glewInit_GL_ARB_vertex_shader\(GLEW_CONTEXT_ARG_VAR_INIT\);/{ GLEW_ARB_vertex_shader = !_glewInit_GL_ARB_vertex_shader(GLEW_CONTEXT_ARG_VAR_INIT); _glewInit_GL_ARB_vertex_program(GLEW_CONTEXT_ARG_VAR_INIT); }/g" -pi $@ + perl -e "s/\(\(glBlendColor = /((glBlendEquation = (PFNGLBLENDEQUATIONPROC)glewGetProcAddress((const GLubyte*)\"glBlendEquation\")) == NULL) || r;\n r = ((glBlendColor = /g" -pi $@ $(BIN)/fix_OML_sync_control.sh $@ rm -f $@.bak @@ -259,6 +260,7 @@ $(S.DEST)/glew_init.c: $(EXT)/.dummy cat $(SRC)/glew_init_tail.c >> $@ perl -e "s/GLEW_VERSION_STRING/$(GLEW_VERSION)/g" -pi $@ perl -e "s/GLEW_ARB_vertex_shader = !_glewInit_GL_ARB_vertex_shader\(GLEW_CONTEXT_ARG_VAR_INIT\);/{ GLEW_ARB_vertex_shader = !_glewInit_GL_ARB_vertex_shader(GLEW_CONTEXT_ARG_VAR_INIT); _glewInit_GL_ARB_vertex_program(GLEW_CONTEXT_ARG_VAR_INIT); }/g" -pi $@ + perl -e "s/\(\(glBlendColor = /((glBlendEquation = (PFNGLBLENDEQUATIONPROC)glewGetProcAddress((const GLubyte*)\"glBlendEquation\")) == NULL) || r;\n r = ((glBlendColor = /g" -pi $@ $(BIN)/fix_OML_sync_control.sh $@ rm -f $@.bak diff --git a/auto/bin/fix_OML_sync_control.sh b/auto/bin/fix_OML_sync_control.sh index 5ad1c67..3f63eff 100755 --- a/auto/bin/fix_OML_sync_control.sh +++ b/auto/bin/fix_OML_sync_control.sh @@ -1,6 +1,6 @@ ## -## Copyright (C) 2003-2005, Marcelo E. Magallon -## Copyright (C) 2003-2005, Milan Ikits +## Copyright (C) 2003-2006, Marcelo E. Magallon +## Copyright (C) 2003-2006, Milan Ikits ## ## This program is distributed under the terms and conditions of the GNU ## General Public License Version 2 as published by the Free Software diff --git a/auto/bin/make.pl b/auto/bin/make.pl index 3d050a7..2262989 100755 --- a/auto/bin/make.pl +++ b/auto/bin/make.pl @@ -1,6 +1,6 @@ ## -## Copyright (C) 2003-2005, Marcelo E. Magallon -## Copyright (C) 2003-2005, Milan Ikits +## Copyright (C) 2003-2006, Marcelo E. Magallon +## Copyright (C) 2003-2006, Milan Ikits ## ## This program is distributed under the terms and conditions of the GNU ## General Public License Version 2 as published by the Free Software diff --git a/auto/bin/make_def_fun.pl b/auto/bin/make_def_fun.pl index 90c738a..d8a1249 100755 --- a/auto/bin/make_def_fun.pl +++ b/auto/bin/make_def_fun.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl ## -## Copyright (C) 2003-2005, Marcelo E. Magallon -## Copyright (C) 2003-2005, Milan Ikits +## Copyright (C) 2003-2006, Marcelo E. Magallon +## Copyright (C) 2003-2006, Milan Ikits ## ## This program is distributed under the terms and conditions of the GNU ## General Public License Version 2 as published by the Free Software diff --git a/auto/bin/make_def_var.pl b/auto/bin/make_def_var.pl index c95beea..b0e5f31 100755 --- a/auto/bin/make_def_var.pl +++ b/auto/bin/make_def_var.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl ## -## Copyright (C) 2003-2005, Marcelo E. Magallon -## Copyright (C) 2003-2005, Milan Ikits +## Copyright (C) 2003-2006, Marcelo E. Magallon +## Copyright (C) 2003-2006, Milan Ikits ## ## This program is distributed under the terms and conditions of the GNU ## General Public License Version 2 as published by the Free Software diff --git a/auto/bin/make_header.pl b/auto/bin/make_header.pl index fb90dcc..426624f 100755 --- a/auto/bin/make_header.pl +++ b/auto/bin/make_header.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl ## -## Copyright (C) 2003-2005, Marcelo E. Magallon -## Copyright (C) 2003-2005, Milan Ikits +## Copyright (C) 2003-2006, Marcelo E. Magallon +## Copyright (C) 2003-2006, Milan Ikits ## ## This program is distributed under the terms and conditions of the GNU ## General Public License Version 2 as published by the Free Software diff --git a/auto/bin/make_html.pl b/auto/bin/make_html.pl index 1fba9f0..8d3ae63 100755 --- a/auto/bin/make_html.pl +++ b/auto/bin/make_html.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl ## -## Copyright (C) 2003-2005, Marcelo E. Magallon -## Copyright (C) 2003-2005, Milan Ikits +## Copyright (C) 2003-2006, Marcelo E. Magallon +## Copyright (C) 2003-2006, Milan Ikits ## ## This program is distributed under the terms and conditions of the GNU ## General Public License Version 2 as published by the Free Software diff --git a/auto/bin/make_info.pl b/auto/bin/make_info.pl index c26c163..b3d935f 100755 --- a/auto/bin/make_info.pl +++ b/auto/bin/make_info.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl ## -## Copyright (C) 2003-2005, Marcelo E. Magallon -## Copyright (C) 2003-2005, Milan Ikits +## Copyright (C) 2003-2006, Marcelo E. Magallon +## Copyright (C) 2003-2006, Milan Ikits ## ## This program is distributed under the terms and conditions of the GNU ## General Public License Version 2 as published by the Free Software diff --git a/auto/bin/make_info_list.pl b/auto/bin/make_info_list.pl index d64d2e3..b8fcee7 100755 --- a/auto/bin/make_info_list.pl +++ b/auto/bin/make_info_list.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl ## -## Copyright (C) 2003-2005, Marcelo E. Magallon -## Copyright (C) 2003-2005, Milan Ikits +## Copyright (C) 2003-2006, Marcelo E. Magallon +## Copyright (C) 2003-2006, Milan Ikits ## ## This program is distributed under the terms and conditions of the GNU ## General Public License Version 2 as published by the Free Software diff --git a/auto/bin/make_init.pl b/auto/bin/make_init.pl index 5427ea1..4c830e2 100755 --- a/auto/bin/make_init.pl +++ b/auto/bin/make_init.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl ## -## Copyright (C) 2003-2005, Marcelo E. Magallon -## Copyright (C) 2003-2005, Milan Ikits +## Copyright (C) 2003-2006, Marcelo E. Magallon +## Copyright (C) 2003-2006, Milan Ikits ## ## This program is distributed under the terms and conditions of the GNU ## General Public License Version 2 as published by the Free Software diff --git a/auto/bin/make_list.pl b/auto/bin/make_list.pl index 16b2ff7..d95e688 100755 --- a/auto/bin/make_list.pl +++ b/auto/bin/make_list.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl ## -## Copyright (C) 2003-2005, Marcelo E. Magallon -## Copyright (C) 2003-2005, Milan Ikits +## Copyright (C) 2003-2006, Marcelo E. Magallon +## Copyright (C) 2003-2006, Milan Ikits ## ## This program is distributed under the terms and conditions of the GNU ## General Public License Version 2 as published by the Free Software diff --git a/auto/bin/make_str.pl b/auto/bin/make_str.pl index 062bfbc..cf52c24 100755 --- a/auto/bin/make_str.pl +++ b/auto/bin/make_str.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl ## -## Copyright (C) 2003-2005, Marcelo E. Magallon -## Copyright (C) 2003-2005, Milan Ikits +## Copyright (C) 2003-2006, Marcelo E. Magallon +## Copyright (C) 2003-2006, Milan Ikits ## ## This program is distributed under the terms and conditions of the GNU ## General Public License Version 2 as published by the Free Software diff --git a/auto/bin/make_struct_fun.pl b/auto/bin/make_struct_fun.pl index 36dbfa9..1ee589e 100755 --- a/auto/bin/make_struct_fun.pl +++ b/auto/bin/make_struct_fun.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl ## -## Copyright (C) 2003-2005, Marcelo E. Magallon -## Copyright (C) 2003-2005, Milan Ikits +## Copyright (C) 2003-2006, Marcelo E. Magallon +## Copyright (C) 2003-2006, Milan Ikits ## ## This program is distributed under the terms and conditions of the GNU ## General Public License Version 2 as published by the Free Software diff --git a/auto/bin/make_struct_var.pl b/auto/bin/make_struct_var.pl index ac84d64..b42986c 100755 --- a/auto/bin/make_struct_var.pl +++ b/auto/bin/make_struct_var.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl ## -## Copyright (C) 2003-2005, Marcelo E. Magallon -## Copyright (C) 2003-2005, Milan Ikits +## Copyright (C) 2003-2006, Marcelo E. Magallon +## Copyright (C) 2003-2006, Milan Ikits ## ## This program is distributed under the terms and conditions of the GNU ## General Public License Version 2 as published by the Free Software diff --git a/auto/bin/parse_spec.pl b/auto/bin/parse_spec.pl index 899f8f3..44ea076 100755 --- a/auto/bin/parse_spec.pl +++ b/auto/bin/parse_spec.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl ## -## Copyright (C) 2003-2005, Marcelo E. Magallon -## Copyright (C) 2003-2005, Milan Ikits +## Copyright (C) 2003-2006, Marcelo E. Magallon +## Copyright (C) 2003-2006, Milan Ikits ## ## This program is distributed under the terms and conditions of the GNU ## General Public License Version 2 as published by the Free Software diff --git a/auto/bin/update_ext.sh b/auto/bin/update_ext.sh index 4b3ec0e..2fc0814 100755 --- a/auto/bin/update_ext.sh +++ b/auto/bin/update_ext.sh @@ -1,7 +1,7 @@ #!/bin/bash ## -## Copyright (C) 2003-2005, Marcelo E. Magallon -## Copyright (C) 2003-2005, Milan Ikits +## Copyright (C) 2003-2006, Marcelo E. Magallon +## Copyright (C) 2003-2006, Milan Ikits ## ## This program is distributed under the terms and conditions of the GNU ## General Public License Version 2 as published by the Free Software diff --git a/auto/bin/update_registry.sh b/auto/bin/update_registry.sh index a7913b6..29e1e85 100755 --- a/auto/bin/update_registry.sh +++ b/auto/bin/update_registry.sh @@ -1,7 +1,7 @@ #!/bin/sh ## -## Copyright (C) 2003-2005, Marcelo E. Magallon -## Copyright (C) 2003-2005, Milan Ikits +## Copyright (C) 2003-2006, Marcelo E. Magallon +## Copyright (C) 2003-2006, Milan Ikits ## ## This program is distributed under the terms and conditions of the GNU ## General Public License Version 2 as published by the Free Software diff --git a/auto/core/GL_ARB_imaging b/auto/core/GL_ARB_imaging index 66dd527..c36822f 100644 --- a/auto/core/GL_ARB_imaging +++ b/auto/core/GL_ARB_imaging @@ -76,6 +76,7 @@ GL_ARB_imaging GL_WRAP_BORDER 0x8152 GL_REPLICATE_BORDER 0x8153 GL_CONVOLUTION_BORDER_COLOR 0x8154 + void glBlendEquation (GLenum mode) void glColorTable (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table) void glColorSubTable (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data) void glColorTableParameteriv (GLenum target, GLenum pname, const GLint *params) diff --git a/auto/core/GL_VERSION_1_4 b/auto/core/GL_VERSION_1_4 index a9fbeb5..a795e0a 100644 --- a/auto/core/GL_VERSION_1_4 +++ b/auto/core/GL_VERSION_1_4 @@ -38,7 +38,6 @@ GL_VERSION_1_4 GL_TEXTURE_LOD_BIAS 0x8501 GL_MAX_TEXTURE_LOD_BIAS 0x84FD GL_MIRRORED_REPEAT 0x8370 - void glBlendEquation (GLenum mode) void glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) void glFogCoordf (GLfloat coord) void glFogCoordfv (const GLfloat *coord) diff --git a/auto/src/glew.rc b/auto/src/glew.rc index 1502a48..7e0eeaa 100644 --- a/auto/src/glew.rc +++ b/auto/src/glew.rc @@ -61,7 +61,7 @@ BEGIN VALUE "FileDescription", "The OpenGL Extension Wrangler Library\0" VALUE "FileVersion", "GLEW_MAJOR,GLEW_MINOR,GLEW_MICRO,0\0" VALUE "InternalName", "GLEW\0" - VALUE "LegalCopyright", "© 2003-2005 Milan Ikits & Marcelo Magallon\0" + VALUE "LegalCopyright", "© 2003-2006 Milan Ikits & Marcelo Magallon\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", FILENAME "\0" VALUE "PrivateBuild", "\0" diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h index 7a001a2..1e1cdc2 100644 --- a/auto/src/glew_head.h +++ b/auto/src/glew_head.h @@ -18,7 +18,7 @@ #define __GLEXT_H_ #define __gl_ATI_h_ -#if defined(_WIN32) +#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) /* * GLEW does not include to avoid name space pollution. @@ -142,16 +142,24 @@ extern "C" { #ifndef GL_VERSION_1_1 #define GL_VERSION_1_1 1 +#if defined(__APPLE__) +typedef unsigned long GLenum; +typedef unsigned long GLbitfield; +typedef unsigned long GLuint; +typedef long GLint; +typedef long GLsizei; +#else typedef unsigned int GLenum; -typedef unsigned char GLboolean; typedef unsigned int GLbitfield; -typedef signed char GLbyte; -typedef short GLshort; +typedef unsigned int GLuint; typedef int GLint; typedef int GLsizei; +#endif +typedef unsigned char GLboolean; +typedef signed char GLbyte; +typedef short GLshort; typedef unsigned char GLubyte; typedef unsigned short GLushort; -typedef unsigned int GLuint; typedef float GLfloat; typedef float GLclampf; typedef double GLdouble; diff --git a/auto/src/glew_license.h b/auto/src/glew_license.h index 23dec60..86ae0a5 100644 --- a/auto/src/glew_license.h +++ b/auto/src/glew_license.h @@ -1,7 +1,7 @@ /* ** The OpenGL Extension Wrangler Library -** Copyright (C) 2002-2005, Milan Ikits -** Copyright (C) 2002-2005, Marcelo E. Magallon +** Copyright (C) 2002-2006, Milan Ikits +** Copyright (C) 2002-2006, Marcelo E. Magallon ** Copyright (C) 2002, Lev Povalahev ** All rights reserved. ** diff --git a/auto/src/glew_utils.c b/auto/src/glew_utils.c index 09e8b67..a831411 100644 --- a/auto/src/glew_utils.c +++ b/auto/src/glew_utils.c @@ -1,7 +1,7 @@ /* ** The OpenGL Extension Wrangler Library -** Copyright (C) 2002-2005, Milan Ikits -** Copyright (C) 2002-2005, Marcelo E. Magallon +** Copyright (C) 2002-2006, Milan Ikits +** Copyright (C) 2002-2006, Marcelo E. Magallon ** Copyright (C) 2002, Lev Povalahev ** All rights reserved. ** diff --git a/auto/src/glew_utils.h b/auto/src/glew_utils.h index 10ba6ba..6a971d0 100644 --- a/auto/src/glew_utils.h +++ b/auto/src/glew_utils.h @@ -1,7 +1,7 @@ /* ** The OpenGL Extension Wrangler Library -** Copyright (C) 2002-2005, Milan Ikits -** Copyright (C) 2002-2005, Marcelo E. Magallon +** Copyright (C) 2002-2006, Milan Ikits +** Copyright (C) 2002-2006, Marcelo E. Magallon ** Copyright (C) 2002, Lev Povalahev ** All rights reserved. ** diff --git a/auto/src/glewinfo.rc b/auto/src/glewinfo.rc index 9717253..c8bfa2d 100644 --- a/auto/src/glewinfo.rc +++ b/auto/src/glewinfo.rc @@ -41,7 +41,7 @@ BEGIN VALUE "FileDescription", "Utility for verifying extension entry points\0" VALUE "FileVersion", "GLEW_MAJOR,GLEW_MINOR,GLEW_MICRO,0\0" VALUE "InternalName", "glewinfo\0" - VALUE "LegalCopyright", "© 2003-2005 Milan Ikits & Marcelo Magallon\0" + VALUE "LegalCopyright", "© 2003-2006 Milan Ikits & Marcelo Magallon\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", FILENAME "\0" VALUE "PrivateBuild", "\0" diff --git a/auto/src/template.html b/auto/src/template.html index c4e6cdb..54f3180 100644 --- a/auto/src/template.html +++ b/auto/src/template.html @@ -1,6 +1,6 @@ diff --git a/auto/src/visualinfo.rc b/auto/src/visualinfo.rc index c25b286..56f8a92 100644 --- a/auto/src/visualinfo.rc +++ b/auto/src/visualinfo.rc @@ -41,7 +41,7 @@ BEGIN VALUE "FileDescription", "Utility for listing pixelformat capabilities\0" VALUE "FileVersion", "GLEW_MAJOR,GLEW_MINOR,GLEW_MICRO,0\0" VALUE "InternalName", "visualinfo\0" - VALUE "LegalCopyright", "© 2003-2005 Milan Ikits & Marcelo Magallon\0" + VALUE "LegalCopyright", "© 2003-2006 Milan Ikits & Marcelo Magallon\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", FILENAME "\0" VALUE "PrivateBuild", "\0" diff --git a/doc/advanced.html b/doc/advanced.html index 6df0e9e..6177f8a 100644 --- a/doc/advanced.html +++ b/doc/advanced.html @@ -1,6 +1,6 @@ diff --git a/doc/basic.html b/doc/basic.html index c302d2b..f6e1571 100644 --- a/doc/basic.html +++ b/doc/basic.html @@ -1,6 +1,6 @@ diff --git a/doc/credits.html b/doc/credits.html index 12159ea..4d7157c 100644 --- a/doc/credits.html +++ b/doc/credits.html @@ -1,6 +1,6 @@ diff --git a/doc/index.html b/doc/index.html index 044f48d..b697006 100644 --- a/doc/index.html +++ b/doc/index.html @@ -1,6 +1,6 @@ diff --git a/doc/install.html b/doc/install.html index 2e6fa96..a92c4d8 100644 --- a/doc/install.html +++ b/doc/install.html @@ -1,6 +1,6 @@ diff --git a/doc/log.html b/doc/log.html index f211652..072c947 100644 --- a/doc/log.html +++ b/doc/log.html @@ -1,6 +1,6 @@ diff --git a/src/visualinfo.c b/src/visualinfo.c index dee97a0..afbe719 100644 --- a/src/visualinfo.c +++ b/src/visualinfo.c @@ -3,7 +3,7 @@ ** ** Copyright (C) Nate Robins, 1997 ** Michael Wimmer, 1999 -** Milan Ikits, 2003-2005 +** Milan Ikits, 2003-2006 ** ** visualinfo is a small utility that displays all available visuals, ** aka. pixelformats, in an OpenGL system along with renderer version