From 71b38cfeb4e08ac6f338bd6f57b940b941f75ec9 Mon Sep 17 00:00:00 2001
From: Nigel Stewart
Date: Sun, 11 Nov 2012 11:43:37 -0600
Subject: [PATCH 01/12] dos2unix for Linux/Mac build from .zip package. Issue
#205 config.guess / MacOSX 10.8 / bad interpreter
---
Makefile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 8c67a95..e61cd22 100644
--- a/Makefile
+++ b/Makefile
@@ -358,8 +358,9 @@ dist-src:
find $(TARDIR) -name CVS -o -name .cvsignore | xargs $(RM) -r
find $(TARDIR) -name .svn | xargs $(RM) -r
find $(TARDIR) -name "*.patch" | xargs $(RM) -r
- unix2dos $(TARDIR)/Makefile
- unix2dos $(TARDIR)/config/*
+ dos2unix $(TARDIR)/Makefile
+ dos2unix $(TARDIR)/auto/Makefile
+ dos2unix $(TARDIR)/config/*
unix2dos $(TARDIR)/auto/core/*
unix2dos $(TARDIR)/auto/extensions/*
find $(TARDIR) -name '*.h' | xargs unix2dos
@@ -376,6 +377,7 @@ dist-src:
rm -f ../$(DIST_SRC_ZIP)
cd .. && zip -rv9 $(DIST_SRC_ZIP) $(DIST_DIR)
dos2unix $(TARDIR)/Makefile
+ dos2unix $(TARDIR)/auto/Makefile
dos2unix $(TARDIR)/config/*
dos2unix $(TARDIR)/auto/core/*
dos2unix $(TARDIR)/auto/extensions/*
From 58ac24cf5ccf64650e5c669aa52e88b21a74d561 Mon Sep 17 00:00:00 2001
From: Nigel Stewart
Date: Sun, 11 Nov 2012 11:50:41 -0600
Subject: [PATCH 02/12] Add the line "Requires: glu" to glew.pc - needed in
general, GLU dependency can be opted-out of, optionally. #204 GLU requirement
and pkg-config file
---
glew.pc.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/glew.pc.in b/glew.pc.in
index 10e946f..4c934af 100644
--- a/glew.pc.in
+++ b/glew.pc.in
@@ -8,3 +8,4 @@ Description: The OpenGL Extension Wrangler library
Version: @version@
Cflags: -I${includedir} @cflags@
Libs: -L${libdir} -l@libname@
+Requires: glu
From 38b7f7d09f32b2e97afe166efbe26f054c6bec1e Mon Sep 17 00:00:00 2001
From: Nigel Stewart
Date: Sun, 11 Nov 2012 11:53:21 -0600
Subject: [PATCH 03/12] In glew.h, check for __gltypes_h_ and define it avoid
glew.h conflicts with Mac OpenGL.framework/Headers/gltypes.h #206 Different
definitions of GLhandleARB in GLEW and OS X headers
---
auto/src/glew_head.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h
index c9f1189..f33f440 100644
--- a/auto/src/glew_head.h
+++ b/auto/src/glew_head.h
@@ -8,6 +8,9 @@
#if defined(__gl2_h_)
#error gl2.h included before glew.h
#endif
+#if defined(__gltypes_h_)
+#error gltypes.h included before glew.h
+#endif
#if defined(__REGAL_H__)
#error Regal.h included before glew.h
#endif
@@ -21,6 +24,7 @@
#define __gl_h_
#define __gl2_h_
#define __GL_H__
+#define __gltypes_h_
#define __REGAL_H__
#define __X_GL_H
#define __glext_h_
From 41c1305a898804ea64df8829ebc72f560b9fe892 Mon Sep 17 00:00:00 2001
From: Nigel Stewart
Date: Sun, 11 Nov 2012 13:09:20 -0600
Subject: [PATCH 04/12] Re-write .pc files unconditionally, in case GLEW_DEST
is specified on command line. #189 Generated .pc files are "easy to break"
---
Makefile | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Makefile b/Makefile
index e61cd22..d218d45 100644
--- a/Makefile
+++ b/Makefile
@@ -123,6 +123,10 @@ tmp/$(SYSTEM)/default/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wgl
@mkdir -p $(dir $@)
$(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
+# Force re-write of glew.pc, GLEW_DEST can vary
+
+.PHONY: glew.pc
+
glew.pc: glew.pc.in
sed \
-e "s|@prefix@|$(GLEW_DEST)|g" \
@@ -159,6 +163,10 @@ tmp/$(SYSTEM)/mx/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h
@mkdir -p $(dir $@)
$(CC) -DGLEW_NO_GLU -DGLEW_MX $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
+# Force re-write of glewmx.pc, GLEW_DEST can vary
+
+.PHONY: glewmx.pc
+
glewmx.pc: glew.pc.in
sed \
-e "s|@prefix@|$(GLEW_DEST)|g" \
From b7b516bf888a0b4af77174af7e5884d9b6fd5458 Mon Sep 17 00:00:00 2001
From: Nigel Stewart
Date: Fri, 15 Feb 2013 20:18:56 -0600
Subject: [PATCH 05/12] Leave APIENTRY defined at the conclusion of glew.h,
since APIENTRY is part of the GL interface for GL_ARB_debug_output purposes,
etc.
---
auto/src/glew_head.h | 2 +-
auto/src/glew_tail.h | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h
index f33f440..8b23fed 100644
--- a/auto/src/glew_head.h
+++ b/auto/src/glew_head.h
@@ -40,7 +40,6 @@
*/
/* */
#ifndef APIENTRY
-#define GLEW_APIENTRY_DEFINED
# if defined(__MINGW32__) || defined(__CYGWIN__)
# define APIENTRY __stdcall
# elif (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__)
@@ -102,6 +101,7 @@ typedef _W64 int ptrdiff_t;
#endif
#ifndef GLAPIENTRY
+#define GLEW_GLAPIENTRY_DEFINED
#define GLAPIENTRY APIENTRY
#endif
diff --git a/auto/src/glew_tail.h b/auto/src/glew_tail.h
index 54023e3..5f07298 100644
--- a/auto/src/glew_tail.h
+++ b/auto/src/glew_tail.h
@@ -51,9 +51,8 @@ GLEWAPI const GLubyte * GLEWAPIENTRY glewGetString (GLenum name);
}
#endif
-#ifdef GLEW_APIENTRY_DEFINED
-#undef GLEW_APIENTRY_DEFINED
-#undef APIENTRY
+#ifdef GLEW_GLAPIENTRY_DEFINED
+#undef GLEW_GLAPIENTRY_DEFINED
#undef GLAPIENTRY
#define GLAPIENTRY
#endif
From db6dbecb7a58296e865ec6891631c178bb779715 Mon Sep 17 00:00:00 2001
From: Nigel Stewart
Date: Mon, 18 Mar 2013 22:22:53 -0500
Subject: [PATCH 06/12] For #212 BaseVertex family: invalid type of "indices"
parameter Convert void* to GLvoid * in function parameters. TODO - const and
void**
---
auto/bin/parse_spec.pl | 1 +
1 file changed, 1 insertion(+)
diff --git a/auto/bin/parse_spec.pl b/auto/bin/parse_spec.pl
index 5544037..85dd61d 100755
--- a/auto/bin/parse_spec.pl
+++ b/auto/bin/parse_spec.pl
@@ -240,6 +240,7 @@ sub parse_spec($)
$return =~ s/void\*/GLvoid */og;
$parms =~ s/$regex{types}/$typemap{$1}/og;
$parms =~ s/$regex{voidtype}/$voidtypemap{$1}/og;
+ $parms =~ s/ void\* / GLvoid */og;
}
# add to functions hash
$functions{$name} = {
From 14854b4ae6caaa6fe2d9b5f808931898f22a129f Mon Sep 17 00:00:00 2001
From: Nigel Stewart
Date: Mon, 18 Mar 2013 22:23:02 -0500
Subject: [PATCH 07/12] Revert commit b7b516bf888a0b4af77174af7e5884d9b6fd5458.
Can't leave APIENTRY defined, it conflicts with windef.h definition of
APIENTRY.
---
auto/src/glew_head.h | 2 +-
auto/src/glew_tail.h | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h
index 8b23fed..f33f440 100644
--- a/auto/src/glew_head.h
+++ b/auto/src/glew_head.h
@@ -40,6 +40,7 @@
*/
/* */
#ifndef APIENTRY
+#define GLEW_APIENTRY_DEFINED
# if defined(__MINGW32__) || defined(__CYGWIN__)
# define APIENTRY __stdcall
# elif (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__)
@@ -101,7 +102,6 @@ typedef _W64 int ptrdiff_t;
#endif
#ifndef GLAPIENTRY
-#define GLEW_GLAPIENTRY_DEFINED
#define GLAPIENTRY APIENTRY
#endif
diff --git a/auto/src/glew_tail.h b/auto/src/glew_tail.h
index 5f07298..54023e3 100644
--- a/auto/src/glew_tail.h
+++ b/auto/src/glew_tail.h
@@ -51,8 +51,9 @@ GLEWAPI const GLubyte * GLEWAPIENTRY glewGetString (GLenum name);
}
#endif
-#ifdef GLEW_GLAPIENTRY_DEFINED
-#undef GLEW_GLAPIENTRY_DEFINED
+#ifdef GLEW_APIENTRY_DEFINED
+#undef GLEW_APIENTRY_DEFINED
+#undef APIENTRY
#undef GLAPIENTRY
#define GLAPIENTRY
#endif
From 1cbe650d279957bc382712a5e9f1ef1a3627f6f5 Mon Sep 17 00:00:00 2001
From: Nigel Stewart
Date: Mon, 18 Mar 2013 22:51:07 -0500
Subject: [PATCH 08/12] Documentation updates - new project links, snapshot
files, github repo.
---
auto/doc/index.html | 25 +-
auto/src/header.html | 8 +-
doc/advanced.html | 8 +-
doc/basic.html | 8 +-
doc/build.html | 8 +-
doc/credits.html | 8 +-
doc/glew.html | 936 ++++++++++++++++++++++---------------------
doc/glxew.html | 119 +++---
doc/index.html | 33 +-
doc/install.html | 8 +-
doc/log.html | 8 +-
doc/wglew.html | 96 ++---
12 files changed, 648 insertions(+), 617 deletions(-)
diff --git a/auto/doc/index.html b/auto/doc/index.html
index 2fcc864..f27a40f 100644
--- a/auto/doc/index.html
+++ b/auto/doc/index.html
@@ -8,12 +8,12 @@ tested on a variety of operating systems, including Windows, Linux,
Mac OS X, FreeBSD, Irix, and Solaris.
-Download Center
+Downloads
GLEW is distributed
-as source and precompiled binaries. The latest release is
-1.9.0
-[08-06-12]:
+as source and precompiled binaries.
+The latest release is
+1.9.0[08-06-12]:
@@ -44,13 +44,26 @@ as source and precompiled binaries. The latest release is
+
-An up-to-date copy is also available from the project repository:
+An up-to-date copy is also available using git:
+
+- Sourceforge
+git clone git://git.code.sf.net/p/glew/code glew
+- github
+git clone https://github.com/nigels-com/glew.git glew
+
+
+
-git clone git://git.code.sf.net/p/glew/code glew-code
+Unsupported snapshots are also available:
+
Supported Extensions
diff --git a/auto/src/header.html b/auto/src/header.html
index d93f9e9..9f9d5be 100644
--- a/auto/src/header.html
+++ b/auto/src/header.html
@@ -59,9 +59,9 @@ THE POSSIBILITY OF SUCH DAMAGE.
Source Generation |
Credits & Copyright |
Change Log |
-Project Page |
-Mailing Lists |
-Bug Tracker |
+Project Page |
+Mailing Lists |
+Bug Tracker |
|
@@ -71,7 +71,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
|
|
@@ -71,7 +71,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
|
|
@@ -71,7 +71,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
|
|
@@ -71,7 +71,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
|
|
@@ -71,7 +71,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
|
|
@@ -71,7 +71,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
-Last Update: 08-06-12 |
+Last Update: 03-18-13 |
@@ -100,497 +100,501 @@ width="88" height="32" border="0" alt="Support This Project"> | -->
Supported OpenGL Extensions
|