cmake: Wrap glproc.hpp in a target to prevent concurrent generation.

[apitrace] / glimports.hpp

diff --git a/glimports.hpp b/glimports.hpp
index b5cdb4b279e6b80c0f94683b5aa4e4619195fc0a..65b0aca1f2977e9ca534830d8eac982918080dec 100644 (file)
--- a/glimports.hpp
+++ b/glimports.hpp
@@ -34,13 +34,19 @@
 // Prevent including system's glext.h
 #define __glext_h_
 
+
 // Some functions take GLenum disguised as GLint.  Apple noticed and fixed it
 // in the Mac OS X 10.6.x gl.h headers.  Regardless, C++ typechecking rules
 // force the wrappers to match the prototype precisely.
-#if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_7)
-#define GLenum_int GLenum
+#if defined(__APPLE__)
+#  include <AvailabilityMacros.h> // for MAC_OS_X_VERSION_10_7
+#  if defined(MAC_OS_X_VERSION_10_7)
+#    define GLenum_int GLint
+#  else
+#    define GLenum_int GLenum
+#  endif
 #else
-#define GLenum_int GLint
+#  define GLenum_int GLint
 #endif
 
 
@@ -137,4 +143,7 @@ CGLError CGLUpdateContext(CGLContextObj ctx);
 #endif
 
 
+#include "eglimports.hpp"
+
+
 #endif /* _GLIMPORTS_HPP_ */