X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glimports.hpp;h=4b21083449114031498b91068c2b9af6db6d7777;hb=21f1659a20fdc9b0698f5374c49a90130678bf8e;hp=f5397719504c07ced789530ab3ffe083972155f1;hpb=1a65d4f6b72866dc04547ecbe7262174ef09cc9a;p=apitrace

diff --git a/glimports.hpp b/glimports.hpp
index f539771..4b21083 100644
--- a/glimports.hpp
+++ b/glimports.hpp
@@ -23,22 +23,69 @@
  *
  **************************************************************************/
 
+/*
+ * Central place for all GL includes, and respective OS dependent headers.
+ */
+
 #ifndef _GLIMPORTS_HPP_
 #define _GLIMPORTS_HPP_
 
 #ifdef WIN32
+
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN 1
 #endif
+
 #include <windows.h>
-#endif
+
+#else /* !WIN32 */
+
+#include <X11/Xlib.h>
+
+#endif /* !WIN32 */
 
 #include <GL/gl.h>
 
 #include <GL/glext.h>
 
+#ifndef GL_TEXTURE_INDEX_SIZE_EXT
+#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
+#endif
+
 #ifdef WIN32
+
 #include <GL/wglext.h>
-#endif /* WIN32 */
+
+#define GLAPIENTRY __stdcall
+
+#ifndef PFD_SUPPORT_DIRECTDRAW
+#define PFD_SUPPORT_DIRECTDRAW 0x00002000
+#endif
+#ifndef PFD_SUPPORT_COMPOSITION
+#define PFD_SUPPORT_COMPOSITION 0x00008000
+#endif
+
+#ifdef __MINGW32__
+
+extern "C"
+typedef struct _WGLSWAP
+{
+    HDC hdc;
+    UINT uiFlags;
+} WGLSWAP, *PWGLSWAP, FAR *LPWGLSWAP;
+
+#define WGL_SWAPMULTIPLE_MAX 16
+
+#endif /* __MINGW32__ */
+
+#else /* !WIN32 */
+
+#include <GL/glx.h>
+#include <GL/glext.h>
+
+/* Prevent collision with Trace::Bool */
+#undef Bool
+
+#endif /* !WIN32 */
 
 #endif /* _GLIMPORTS_HPP_ */