Merge https://github.com/nigels-com/glew.git into master HEAD at Sun Jan 31 17:44:14 GMT 2016

README.md

@@ -9,27 +9,104 @@ https://github.com/nigels-com/glew
 [![Build Status](https://travis-ci.org/nigels-com/glew.svg?branch=master)](https://travis-ci.org/nigels-com/glew)
 [![Gitter](https://badges.gitter.im/nigels-com/glew.svg)](https://gitter.im/nigels-com/glew?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
+## Downloads
+
+Current release is [1.13.0](https://sourceforge.net/projects/glew/files/glew/1.13.0/).
+[(Change Log)](http://glew.sourceforge.net/log.html)
+
+Sources available as 
+[ZIP](https://sourceforge.net/projects/glew/files/glew/1.13.0/glew-1.13.0.zip/download) or
+[TGZ](https://sourceforge.net/projects/glew/files/glew/1.13.0/glew-1.13.0.tgz/download).
+
+Windows binaries for [32-bit and 64-bit](https://sourceforge.net/projects/glew/files/glew/1.13.0/glew-1.13.0-win32.zip/download).
+
+### Recent snapshots
+
+Snapshots may contain new features, bug-fixes or new OpenGL extensions ahead of tested, official releases.
+
+[glew-20160131.tgz](http://sourceforge.net/projects/glew/files/glew/snapshots/glew-20160131.tgz/download) 
+*GLEW 2.0.0 release candidate: Core context support, MX discontinued*
+
+[glew-20151117.tgz](http://sourceforge.net/projects/glew/files/glew/snapshots/glew-20151117.tgz/download)
+
+[glew-20150805.tgz](http://sourceforge.net/projects/glew/files/glew/snapshots/glew-20150805.tgz/download)
+
 ## Build
 
-If you downloaded the tarball or zip archive from the GLEW website,
+From a downloaded tarball or zip archive:
-you just need to:
 
-### Unix
+### Linux and Mac
+
+#### Using GNU Make
+
+##### Install build tools
+
+Debian/Ubuntu/Mint:    `$ sudo apt-get install build-essential libXmu-dev libXi-dev libgl-dev git`
+
+RedHat/CentOS/Fedora:  `$ sudo yum install libXmu-devel libXi-devel libGL-devel git`
+
+##### Build
 
 	$ make
 	$ sudo make install
 	$ make clean
 
+Targets:    `all, glew.lib, glew.bin, clean, install, uninstall`
+
+Variables:  `SYSTEM=linux-clang, GLEW_DEST=/usr/local, STRIP=`
+
+#### Using cmake
+
+*CMake 2.8.12 or higher is required.*
+
+##### Install build tools
+
+Debian/Ubuntu/Mint:   `$ sudo apt-get install build-essential libXmu-dev libXi-dev libgl-dev git cmake`
+
+RedHat/CentOS/Fedora: `$ sudo yum install libXmu-devel libXi-devel libGL-devel git cmake`
+
+##### Build
+
+	$ cd build
+	$ cmake ./cmake 
+	$ make -j4
+
 ### Windows
 
-use the project file in build/vc12/
+Use the provided Visual Studio project file in build/vc12/
+
+## glewinfo
+
+`glewinfo` is a command-line tool useful for inspecting the capabilities of an
+OpenGL implementation and GLEW support for that.  Please include the output of
+`glewinfo` with bug reports, as appropriate.	
+
+	---------------------------
+	    GLEW Extension Info
+	---------------------------
+
+	GLEW version 2.0.0
+	Reporting capabilities of pixelformat 3
+	Running on a Intel(R) HD Graphics 3000 from Intel
+	OpenGL version 3.1.0 - Build 9.17.10.4229 is supported
+
+	GL_VERSION_1_1:                                                OK
+	---------------
+
+	GL_VERSION_1_2:                                                OK
+	---------------
+	  glCopyTexSubImage3D:                                         OK
+	  glDrawRangeElements:                                         OK
+	  glTexImage3D:                                                OK
+	  glTexSubImage3D:                                             OK
+	
+	...
 
 ## Code Generation
 
-If you wish to build GLEW from scratch (update the extension data from
+A Unix or Mac environment is neded for building GLEW from scratch to
-the net or add your own extension information), you need a Unix
+include new extensions, or customize the code generation. The extension
-environment (including wget, perl, and GNU make).  The extension data
+data is regenerated from the top level source directory with:
-is regenerated from the top level source directory with:
 
 	make extensions
 
@@ -41,3 +118,29 @@ https://sourceforge.net/projects/glew/files/glew/snapshots/
 Travis-built snapshots are also available:
 
 https://glew.s3.amazonaws.com/index.html
+
+## Authors
+
+GLEW is currently maintained by [Nigel Stewart](https://github.com/nigels-com)
+with bug fixes, new OpenGL extension support and new releases.
+
+GLEW was developed by [Milan Ikits](http://www.cs.utah.edu/~ikits/)
+and [Marcelo Magallon](http://wwwvis.informatik.uni-stuttgart.de/~magallon/).
+Aaron Lefohn, Joe Kniss, and Chris Wyman were the first users and also
+assisted with the design and debugging process.  
+
+The acronym GLEW originates from Aaron Lefohn.
+Pasi Kärkkäinen identified and fixed several problems with
+GLX and SDL.  Nate Robins created the `wglinfo` utility, to
+which modifications were made by Michael Wimmer.  
+
+## Copyright and Licensing
+
+GLEW is originally derived from the EXTGL project by Lev Povalahev.
+The source code is licensed under the 
+[Modified BSD License](http://glew.sourceforge.net/glew.txt), the 
+[Mesa 3-D License](http://glew.sourceforge.net/mesa.txt) (MIT) and the
+[Khronos License](http://glew.sourceforge.net/khronos.txt) (MIT).
+
+The automatic code generation scripts are released under the 
+[GNU GPL](http://glew.sourceforge.net/gpl.txt).

auto/doc/credits.html

@@ -1,25 +1,2 @@
-<h2>Credits</h2>
+<p><a href="https://github.com/nigels-com/glew#copyright-and-licensing">
-
+Author, copyright and licensing information</a> on github.</p>
-<p>
-GLEW was developed by <a href="http://www.cs.utah.edu/~ikits/">Milan
-Ikits</a> and <a
-href="http://wwwvis.informatik.uni-stuttgart.de/~magallon/">Marcelo
-Magallon</a>.  They also perform occasional maintainance to make sure
-that GLEW stays in mint condition.  Aaron Lefohn, Joe Kniss, and Chris
-Wyman were the first users and also assisted with the design and
-debugging process.  The acronym GLEW originates from Aaron Lefohn.
-Pasi K&auml;rkk&auml;inen identified and fixed several problems with
-GLX and SDL.  Nate Robins created the <tt>wglinfo</tt> utility, to
-which modifications were made by Michael Wimmer.  
-</p>
-
-<h2>Copyright</h2>
-
-<p>
-GLEW is originally derived from the EXTGL project by Lev Povalahev.
-The source code is licensed under the <a href="glew.txt">Modified BSD
-License</a>, the <a href="mesa.txt">Mesa 3-D License</a> (MIT
-License), and the <a href="khronos.txt">Khronos License</a> (MIT
-License).  The automatic code generation scripts are released under
-the <a href="gpl.txt">GNU GPL</a>.
-</p>

auto/doc/index.html

@@ -60,8 +60,8 @@ 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-20160131.tgz/download">glew-20160131.tgz</a></li>
 <li><a href="http://sourceforge.net/projects/glew/files/glew/snapshots/glew-20151117.tgz/download">glew-20151117.tgz</a></li>
-<li><a href="http://sourceforge.net/projects/glew/files/glew/snapshots/glew-20150805.tgz/download">glew-20150805.tgz</a></li>
 </ul>
 
 <h2>Supported Extensions</h2>

auto/src/header.html

@@ -57,12 +57,15 @@ THE POSSIBILITY OF SUCH DAMAGE.
 <tr><td align="center"><a href="build.html">Building</a></td></tr>
 <tr><td align="center"><a href="install.html">Installation</a></td></tr>
 <tr><td align="center"><a href="advanced.html">Source Generation</a></td></tr>
-<tr><td align="center"><a href="credits.html">Credits & Copyright</a></td></tr>
 <tr><td align="center"><a href="log.html">Change Log</a></td></tr>
-<tr></tr>
+<tr><td align="center"><br></tr>
 <tr><td align="center"><a href="https://github.com/nigels-com/glew">GitHub</a></td></tr>
-<tr><td align="center"><a href="https://sourceforge.net/projects/glew">Project Page</a></td></tr>
+<tr><td align="center"><a href="https://github.com/nigels-com/glew/issues">Issues</a></td></tr>
-<tr><td align="center"><a href="http://sourceforge.net/p/glew/bugs/">Bug Tracker</a></td></tr>
+<tr><td align="center"><a href="https://github.com/nigels-com/glew/pulls">Pull Requests</a></td></tr>
+<tr><td align="center"><a href="https://github.com/nigels-com/glew#authors">Authors</a></td></tr>
+<tr><td align="center"><a href="https://github.com/nigels-com/glew#copyright-and-licensing">Licensing</a></td></tr>
+<tr><td align="center"><br></tr>
+<tr><td align="center"><a href="https://sourceforge.net/projects/glew">SourceForge Page</a></td></tr>
 </table>
 <tr><td align="center"><br></tr>
 </table>
@@ -72,10 +75,11 @@ THE POSSIBILITY OF SUCH DAMAGE.
 
 <td valign="bottom">
 <table border="0" width="100%" cellpadding="5" cellspacing="0" align="left">
-<tr><td align="center"><i>Last Update: 08-10-15</i></td></tr>
+<tr><td align="center"><i>Last Update: 01-31-16</i></td></tr>
 <tr><td align="center">
 	<a href="http://www.opengl.org"><img src="./ogl_sm.jpg" width="68" height="35" border="0" alt="OpenGL Logo"></a><br/>
 	<a href="https://github.com/nigels-com/glew"><img src="github.png" width="70" height="29" border="0" alt="GitHub Logo"></a><br/>
+	<a href="https://travis-ci.org/nigels-com/glew/builds"><img src="travis.png" width="114" height="25" border="0" alt="Travis Logo"></a><br/>
 	<a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=67586&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
 </td>
 </tr>

doc/glew.txt

@@ -1,4 +1,5 @@
 The OpenGL Extension Wrangler Library
+Copyright (C) 2008-2016, Nigel Stewart <nigels[]users sourceforge net>
 Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
 Copyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
 Copyright (C) 2002, Lev Povalahev