Always link the Windows binaries against OpenGL

Just as with every other platform.

CMakeLists.txt

@@ -663,7 +663,6 @@ elseif (WIN32)
 		sys/win32/win_input.cpp
 		sys/win32/win_main.cpp
 		sys/win32/win_net.cpp
-		sys/win32/win_qgl.cpp
 		sys/win32/win_shared.cpp
 		sys/win32/win_syscon.cpp
 		sys/win32/win_taskkeyhook.cpp

renderer/qgl.h

@@ -166,7 +166,7 @@ extern PFNGLDEPTHBOUNDSEXTPROC              qglDepthBoundsEXT;
 //===========================================================================
 
 // non-windows systems will just redefine qgl* to gl*
-#ifndef _WIN32
+#if 1
 
 #include "qgl_linked.h"
 
@@ -540,6 +540,6 @@ extern int  ( WINAPI * qwglGetLayerPaletteEntries)(HDC, int, int, int,
 extern BOOL ( WINAPI * qwglRealizeLayerPalette)(HDC, int, BOOL);
 extern BOOL ( WINAPI * qwglSwapLayerBuffers)(HDC, UINT);
 
-#endif	// _WIN32
+#endif
 
 #endif

renderer/qgl_linked.h

@@ -363,6 +363,13 @@ If you have questions concerning this license or the applicable additional terms
 #define qglVertexPointer glVertexPointer
 #define qglViewport glViewport
 
+#ifdef _WIN32
+#define qwglCreateContext wglCreateContext
+#define qwglDeleteContext wglDeleteContext
+#define qwglMakeCurrent	wglMakeCurrent
+#define qwglSwapBuffers SwapBuffers
+#define qwglGetProcAddress wglGetProcAddress
+#else
 #ifdef GLX_VERSION_1_1 // catch all for any GLX-aware situation
 #define qglXChooseVisual glXChooseVisual
 #define qglXCreateContext glXCreateContext
@@ -371,3 +378,4 @@ If you have questions concerning this license or the applicable additional terms
 #define qglXSwapBuffers glXSwapBuffers
 #define qglXGetProcAddressARB glXGetProcAddressARB
 #endif
+#endif