From bf90e156f37b72899fea65c79006f5c4ab59f57e Mon Sep 17 00:00:00 2001
From: the_fiddler <the_fiddler@ebc5dd9b-fb1d-0410-b6f8-d24c324e9604>
Date: Tue, 6 Dec 2011 15:14:58 +0000
Subject: [PATCH] Fixed extension (and core) loading on windows.

---
 Source/Bind/CppSpecWriter.cs | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/Source/Bind/CppSpecWriter.cs b/Source/Bind/CppSpecWriter.cs
index 37117069..9dc3d36c 100644
--- a/Source/Bind/CppSpecWriter.cs
+++ b/Source/Bind/CppSpecWriter.cs
@@ -42,14 +42,13 @@ namespace Bind
     sealed class CppSpecWriter : ISpecWriter
     {
         readonly char[] numbers = "0123456789".ToCharArray();
-        const string AllowDeprecated = "ALLOW_DEPRECATED_GL";
+        const string AllowDeprecated = "GLPP_COMPATIBLE";
         const string DigitPrefix = "T"; // Prefix for identifiers that start with a digit
         const string OutputFileHeader = "gl++.h";
 
         #region Verbatim parts of output file
 
         const string GetAddressDefinition = @"
-
     namespace Internals
     {
         #if defined(_WIN32)
@@ -59,7 +58,25 @@ namespace Bind
             typedef int (*PROC)();
             extern void* __stdcall wglGetCurrentContext();
             extern PROC __stdcall wglGetProcAddress(const char *procname);
+            extern void* __stdcall LoadLibraryA(const char *libname);
+            extern PROC __stdcall GetProcAddress(void *module, const char *procname);
         }
+        inline void*& LoadGLAddress()
+        {
+            static void* address = LoadLibraryA(""opengl32.dll"");
+            return address;
+        }
+        inline void*& GetGLAddress()
+        {
+            static void* address = LoadGLAddress();
+            return address;
+        }
+        inline PROC winGetAddress(const char *procname)
+        {
+            PROC addr = GetProcAddress(GetGLAddress(), procname);
+            return addr ? addr : wglGetProcAddress(procname);
+        }
+
         #elif !defined(__APPLE__)
         extern ""C""
         {
@@ -145,7 +162,7 @@ namespace Bind
         inline void* GetAddress(const char* name)
         {
         #if defined(_WIN32)
-            return (void*)wglGetProcAddress(name);
+            return (void*)winGetAddress(name);
         #elif defined(__APPLE__)
             return (void*)NSGLGetProcAddress(name);
         #elif defined(__sgi) || defined(__sun)