1 files changed, 38 insertions, 26 deletions
diff --git a/src/win_gl.c b/src/win_gl.c
index f707fc6..4f33e36 100644
--- a/src/win_gl.c
+++ b/src/win_gl.c
@@ -5,7 +5,7 @@
 #include "types.h"
 #include "win.h"
 
-#include "pugl/gl.h"
+#include <pugl/gl.h>
 
 #include <windows.h>
 
@@ -14,30 +14,42 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
-#define WGL_DRAW_TO_WINDOW_ARB 0x2001
-#define WGL_ACCELERATION_ARB 0x2003
-#define WGL_SUPPORT_OPENGL_ARB 0x2010
-#define WGL_DOUBLE_BUFFER_ARB 0x2011
-#define WGL_PIXEL_TYPE_ARB 0x2013
-#define WGL_RED_BITS_ARB 0x2015
-#define WGL_GREEN_BITS_ARB 0x2017
-#define WGL_BLUE_BITS_ARB 0x2019
-#define WGL_ALPHA_BITS_ARB 0x201b
-#define WGL_DEPTH_BITS_ARB 0x2022
-#define WGL_STENCIL_BITS_ARB 0x2023
-#define WGL_FULL_ACCELERATION_ARB 0x2027
-#define WGL_TYPE_RGBA_ARB 0x202b
-#define WGL_SAMPLE_BUFFERS_ARB 0x2041
-#define WGL_SAMPLES_ARB 0x2042
-
-#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091
-#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092
-#define WGL_CONTEXT_FLAGS_ARB 0x2094
-#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126
-
-#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
-#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
-#define WGL_CONTEXT_DEBUG_BIT_ARB 0x00000001
+typedef enum {
+  WGL_DRAW_TO_WINDOW_ARB = 0x2001,
+  WGL_ACCELERATION_ARB   = 0x2003,
+  WGL_SUPPORT_OPENGL_ARB = 0x2010,
+  WGL_DOUBLE_BUFFER_ARB  = 0x2011,
+  WGL_PIXEL_TYPE_ARB     = 0x2013,
+  WGL_RED_BITS_ARB       = 0x2015,
+  WGL_GREEN_BITS_ARB     = 0x2017,
+  WGL_BLUE_BITS_ARB      = 0x2019,
+  WGL_ALPHA_BITS_ARB     = 0x201B,
+  WGL_DEPTH_BITS_ARB     = 0x2022,
+  WGL_STENCIL_BITS_ARB   = 0x2023,
+  WGL_SAMPLE_BUFFERS_ARB = 0x2041,
+  WGL_SAMPLES_ARB        = 0x2042,
+} PuglWinGlHintName;
+
+typedef enum {
+  WGL_FULL_ACCELERATION_ARB = 0x2027,
+  WGL_TYPE_RGBA_ARB         = 0x202B,
+} PuglWinGlHintValue;
+
+typedef enum {
+  WGL_CONTEXT_MAJOR_VERSION_ARB = 0x2091,
+  WGL_CONTEXT_MINOR_VERSION_ARB = 0x2092,
+  WGL_CONTEXT_FLAGS_ARB         = 0x2094,
+  WGL_CONTEXT_PROFILE_MASK_ARB  = 0x9126,
+} PuglWinGlContextAttribName;
+
+typedef enum {
+  WGL_CONTEXT_CORE_PROFILE_BIT_ARB          = 0x00000001,
+  WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB = 0x00000002,
+} PuglWinGlContextProfileBit;
+
+typedef enum {
+  WGL_CONTEXT_DEBUG_BIT_ARB = 0x00000001,
+} PuglWinGlContextDebugBit;
 
 typedef HGLRC(WINAPI* WglCreateContextAttribs)(HDC, HGLRC, const int*);
 
@@ -288,7 +300,7 @@ puglGetProcAddress(const char* name)
 
   return func
            ? func
-           : (PuglGlFunc)GetProcAddress(GetModuleHandle("opengl32.dll"), name);
+           : (PuglGlFunc)GetProcAddress(GetModuleHandleA("opengl32.dll"), name);
 }
 
 PuglStatus