Search for freeglut/libfreeglut/glut32 on Windows. Bumped version to 2.7.0.9.

Author: svenpanne

CHANGELOG.md

@@ -1,3 +1,8 @@
+2.7.0.9
+--------
+* Windows: The GLUT package compiles without any additional GLUT library now.
+* Windows: We search for a native freeglut DLL, a MinGW freeglut DLL and a classic GLUT DLL, in that order.
+
 2.7.0.8
 --------
 * Relaxed upper version bound for `OpenGLRaw`.

GLUT.cabal

@@ -1,5 +1,5 @@
 name: GLUT
-version: 2.7.0.8
+version: 2.7.0.9
 synopsis: A binding for the OpenGL Utility Toolkit
 description:
   A Haskell binding for the OpenGL Utility Toolkit, a window system independent

cbits/HsGLUT.c

@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------------
  *
  * Module      :  C support for Graphics.UI.GLUT.Raw
- * Copyright   :  (c) Sven Panne 2002-2013
+ * Copyright   :  (c) Sven Panne 2002-2016
  * License     :  BSD3
  *
  * Maintainer  :  Sven Panne <[email protected]>
@@ -85,16 +85,19 @@ hs_GLUT_getProcAddress(const char *name)
 
   if (firstTime) {
     firstTime = 0;
-    handle = LoadLibrary(TEXT("glut32"));
 
-    // If glut32 isn't present, try freeglut instead
+    /* Try to load freeglut first, it has a few extra features compared to
+       classic GLUT. */
+    handle = LoadLibrary(TEXT("freeglut"));
+
+    /* The MinGW-w64 version of freeglut prefixes "lib" onto the DLL name. */
     if (!handle) {
-      handle = LoadLibrary(TEXT("freeglut"));
+      handle = LoadLibrary(TEXT("libfreeglut"));
     }
 
-    // The MinGW-w64 version of freeglut prefixes "lib" onto the DLL name
+    /* If no freeglut version is found, try plain old glut32 instead. */
     if (!handle) {
-      handle = LoadLibrary(TEXT("libfreeglut"));
+      handle = LoadLibrary(TEXT("glut32"));
     }
   }