Update FindQJSON.cmake to the latest version.

[apitrace] / glimports.hpp

diff --git a/glimports.hpp b/glimports.hpp
index 9c5492ae0165c97ba8c73419a761ddeeaa78273b..5277a0aabd2cc6871f0bc253e28a7dd571563bcc 100644 (file)
--- a/glimports.hpp
+++ b/glimports.hpp
@@ -23,26 +23,74 @@
  *
  **************************************************************************/
 
+/*
+ * Central place for all GL includes, and respective OS dependent headers.
+ */
+
 #ifndef _GLIMPORTS_HPP_
 #define _GLIMPORTS_HPP_
 
-#ifdef WIN32
+#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 */
+
+// Prevent including system's glext.h
+#define __glext_h_
 
 #include <GL/gl.h>
 
-#include "glext.h"
+#undef __glext_h_
+
+#include "glext/glext.h"
 
 #ifndef GL_TEXTURE_INDEX_SIZE_EXT
 #define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
 #endif
 
-#ifdef WIN32
-#include "wglext.h"
-#endif /* WIN32 */
+#ifdef _WIN32
+
+#include "glext/wglext.h"
+
+#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 "glext/glxext.h"
+
+/* Prevent collision with Trace::Bool */
+#undef Bool
+
+#endif /* !_WIN32 */
 
 #endif /* _GLIMPORTS_HPP_ */