Merge https://github.com/nigels-com/glew.git into master HEAD at Thu Sep 18 17:44:12 GMT 2014

auto/bin/filter_gl_ext.sh

@@ -490,5 +490,9 @@ EOT
     grep -v 'glBlendBarrierKHR' $1/GL_KHR_blend_equation_advanced_coherent > tmp
     mv tmp $1/GL_KHR_blend_equation_advanced_coherent
 
+# Filter out GL_NONE enum from GL_KHR_robustness
+    grep -v 'GL_NONE' $1/GL_KHR_context_flush_control > tmp
+    mv tmp $1/GL_KHR_context_flush_control
+
 # clean up
     rm -f $1/*.bak

auto/bin/parse_spec.pl

@@ -20,7 +20,7 @@ my @sections = (
     "Name",
     "Name Strings?",
     "New Procedures and Functions",
-    "New Tokens",
+    "New Tokens.*",                    # Optional (GL/WGL/GLX/...) suffix
     "Additions to Chapter.*",
 );
 

auto/doc/index.html

@@ -60,9 +60,9 @@ An up-to-date copy is also available using <a href="http://git-scm.com/">git</a>
 <a href="https://sourceforge.net/projects/glew/files/glew/snapshots/">Unsupported snapshots</a> are also available:
 </p>
 <ul>
+<li><a href="http://sourceforge.net/projects/glew/files/glew/snapshots/glew-20140918.tgz/download">glew-20140918.tgz</a></li>
+<li><a href="http://sourceforge.net/projects/glew/files/glew/snapshots/glew-20140820.tgz/download">glew-20140820.tgz</a></li>
 <li><a href="http://sourceforge.net/projects/glew/files/glew/snapshots/glew-20140726.tgz/download">glew-20140726.tgz</a></li>
-<li><a href="http://sourceforge.net/projects/glew/files/glew/snapshots/glew-20140206.tgz/download">glew-20140206.tgz</a></li>
-<li><a href="http://sourceforge.net/projects/glew/files/glew/snapshots/glew-20140110.tgz/download">glew-20140110.tgz</a></li>
 </ul>
 
 <h2>Supported Extensions</h2>

auto/src/glew_head.h

@@ -2,7 +2,7 @@
 #define __glew_h__
 #define __GLEW_H__
 
-#if defined(__gl_h_) || defined(__GL_H__) || defined(__X_GL_H)
+#if defined(__gl_h_) || defined(__GL_H__) || defined(_GL_H) || defined(__X_GL_H)
 #error gl.h included before glew.h
 #endif
 #if defined(__gl2_h_)
@@ -24,6 +24,7 @@
 #define __gl_h_
 #define __gl2_h_
 #define __GL_H__
+#define _GL_H
 #define __gltypes_h_
 #define __REGAL_H__
 #define __X_GL_H

config/Makefile.linux-mingw-w64

@@ -0,0 +1,26 @@
+# For cross-compiling from Linux to Windows x86 using mingw-w64
+# http://mingw-w64.sourceforge.net/
+#
+# $ make SYSTEM=linux-mingw-w64
+#
+
+NAME  := glew32
+CC    := i686-w64-mingw32-gcc
+LD    := i686-w64-mingw32-ld
+LN    :=
+STRIP :=
+CFLAGS.SO = -DGLEW_BUILD
+LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
+WARN = -Wall -W
+POPT = -O2
+BIN.SUFFIX = .exe
+LIB.SONAME    = lib$(NAME).dll
+LIB.DEVLNK    = lib$(NAME).dll.a    # for mingw this is the dll import lib
+LIB.SHARED    = $(NAME).dll
+LIB.STATIC    = lib$(NAME).a        # the static lib will be broken (see CFLAGS.SO)
+LDFLAGS.SO    = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK)
+LIB.SONAME.MX = lib$(NAME)mx.dll
+LIB.DEVLNK.MX = lib$(NAME)mx.dll.a  # for mingw this is the dll import lib
+LIB.SHARED.MX = $(NAME)mx.dll
+LIB.STATIC.MX = lib$(NAME)mx.a      # the static lib will be broken (see CFLAGS.SO)
+LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) --out-implib lib/$(LIB.DEVLNK.MX)