Drop HAVE_EGL.

Unnecessary now that we budle EGL/GLES headers

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d42aa1e05900e5701372cefd68bbd1b2b50918da..5c637b4d47d237719e1386b77ef880c1164623bc 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,10 +60,6 @@ else ()
         include_directories (${X11_INCLUDE_DIR})
         add_definitions (-DHAVE_X11)
     endif ()
-
-    if (ENABLE_EGL)
-        add_definitions (-DHAVE_EGL)
-    endif ()
 endif ()
 
 

diff --git a/eglimports.hpp b/eglimports.hpp
index 5443bef61d3bddb633a1362761951be7c992855e..a3e396abf8046d63ffb373b215c8cc03f7030bc6 100644 (file)
--- a/eglimports.hpp
+++ b/eglimports.hpp
@@ -32,7 +32,13 @@
 #define _EGLIMPORTS_HPP_
 
 
-#ifdef HAVE_EGL
+#include <KHR/khrplatform.h>
+
+#ifdef _GDI32_
+/* Prevent __declspec(dllimport) attribute */
+#undef KHRONOS_APICALL
+#define KHRONOS_APICALL
+#endif
 
 // EGL
 #include <EGL/egl.h>
@@ -45,28 +51,6 @@
 #include <GLES/glplatform.h>
 #include <GLES2/gl2platform.h>
 
-#else // HAVE_EGL
-
-// We always include GLES headers below to have the types and enums defined.
-// For that to work without GLES platform headers, we need to define GL_API,
-// GL_APICALL, and GL_APIENTRY.  It does not matter what they are defined to.
-// When we hit here, EGL/GLES support is disabled and all we need from the
-// headers are the types and enums.
-
-#ifndef GL_API
-#define GL_API GLAPI
-#endif
-
-#ifndef GL_APICALL
-#define GL_APICALL GLAPI
-#endif
-
-#ifndef GL_APIENTRY
-#define GL_APIENTRY APIENTRY
-#endif
-
-#endif //! HAVE_EGL
-
 
 // OpenGL ES 1.1
 typedef int32_t  GLfixed;