From 127e4e0b5a6509046ee77f691f690fdce1c84079 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Thu, 29 Mar 2012 23:38:55 +0100 Subject: [PATCH] Drop HAVE_EGL. Unnecessary now that we budle EGL/GLES headers --- CMakeLists.txt | 4 ---- eglimports.hpp | 30 +++++++----------------------- 2 files changed, 7 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d42aa1e..5c637b4 100755 --- 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 5443bef..a3e396a 100644 --- a/eglimports.hpp +++ b/eglimports.hpp @@ -32,7 +32,13 @@ #define _EGLIMPORTS_HPP_ -#ifdef HAVE_EGL +#include + +#ifdef _GDI32_ +/* Prevent __declspec(dllimport) attribute */ +#undef KHRONOS_APICALL +#define KHRONOS_APICALL +#endif // EGL #include @@ -45,28 +51,6 @@ #include #include -#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; -- 2.43.0