Fixed CMake configuration issue with EGL and GLES and wrong include h…

…eader order for EGL
SFML · Apr 13, 2019 · e709ef6 · e709ef6
1 parent 4043f71
commit e709ef6
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 24 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-
 # CLI based examples
 if (NOT SFML_OS_IOS)
     if(SFML_BUILD_NETWORK)

diff --git a/examples/opengl/CMakeLists.txt b/examples/opengl/CMakeLists.txt
@@ -16,5 +16,5 @@ endif()
 sfml_add_example(opengl GUI_APP
                  SOURCES ${SRC}
                  BUNDLE_RESOURCES ${RESOURCES}
-                 DEPENDS sfml-graphics OpenGL
+                 DEPENDS sfml-graphics
                  RESOURCES_DIR resources)
diff --git a/examples/window/CMakeLists.txt b/examples/window/CMakeLists.txt
@@ -4,7 +4,13 @@ set(SRCROOT ${PROJECT_SOURCE_DIR}/examples/window)
 # all source files
 set(SRC ${SRCROOT}/Window.cpp)
 
+if(SFML_OPENGL_ES)
+    set(DEPENDENCY GLES) 
+else()
+    set(DEPENDENCY OpenGL) 
+endif()
+
 # define the window target
 sfml_add_example(window GUI_APP
                  SOURCES ${SRC}
-                 DEPENDS sfml-window OpenGL)
+                 DEPENDS sfml-window ${DEPENDENCY})
diff --git a/src/SFML/Graphics/CMakeLists.txt b/src/SFML/Graphics/CMakeLists.txt
@@ -113,13 +113,8 @@ endif()
 
 # find external libraries
 if(SFML_OPENGL_ES)
-    if(SFML_OS_LINUX)
-        sfml_find_package(EGL INCLUDE "EGL_INCLUDE_DIR" LINK "EGL_LIBRARY")
-        sfml_find_package(GLES INCLUDE "GLES_INCLUDE_DIR" LINK "GLES_LIBRARY")
-        target_link_libraries(sfml-graphics PRIVATE EGL GLES)
-    elseif(SFML_OS_IOS)
-        target_link_libraries(sfml-graphics PRIVATE "-framework OpenGLES")
-    endif()
+    # Target GLES already defined for Window component so no sfml_find_package() here
+    target_link_libraries(sfml-graphics PRIVATE GLES)
 else()
     # Target OpenGL already defined for Window component so no sfml_find_package() here
     target_link_libraries(sfml-graphics PRIVATE OpenGL)
@@ -131,7 +126,7 @@ else()
 endif()
 
 if(SFML_OS_ANDROID)
-    target_link_libraries(sfml-graphics PRIVATE z EGL GLESv1_CM)
+    target_link_libraries(sfml-graphics PRIVATE z)
 elseif(SFML_OS_IOS)
     target_link_libraries(sfml-graphics PRIVATE z bz2)
 endif()

diff --git a/src/SFML/Window/CMakeLists.txt b/src/SFML/Window/CMakeLists.txt
@@ -251,14 +251,19 @@ endif()
 
 if(SFML_OPENGL_ES)
     if(SFML_OS_IOS)
-        sfml_add_external(OpenGL LINK "-framework OpenGLES")
-    elseif(SFML_OS_ANDROID)
-        sfml_add_external(OpenGL LINK "EGL" "GLESv1_CM")
+        sfml_add_external(GLES LINK "-framework OpenGLES")
+    else()
+        sfml_find_package(GLES INCLUDE "GLES_INCLUDE_DIR" LINK "GLES_LIBRARY")
+
+        sfml_find_package(EGL INCLUDE "EGL_INCLUDE_DIR" LINK "EGL_LIBRARY")
+        target_link_libraries(sfml-window PRIVATE EGL)
     endif()
+
+    target_link_libraries(sfml-window PRIVATE GLES)
 else()
     sfml_find_package(OpenGL INCLUDE "OPENGL_INCLUDE_DIR" LINK "OPENGL_gl_LIBRARY")
+    target_link_libraries(sfml-window PRIVATE OpenGL)
 endif()
-target_link_libraries(sfml-window PRIVATE OpenGL)
 
 if(SFML_OS_WINDOWS AND NOT SFML_COMPILER_MSVC)
     include(CheckIncludeFile)
@@ -268,12 +273,6 @@ if(SFML_OS_WINDOWS AND NOT SFML_COMPILER_MSVC)
     endif()
 endif()
 
-if(SFML_OPENGL_ES AND SFML_OS_LINUX)
-    sfml_find_package(EGL INCLUDE "EGL_INCLUDE_DIR" LINK "EGL_LIBRARY")
-    sfml_find_package(GLES INCLUDE "GLES_INCLUDE_DIR" LINK "GLES_LIBRARY")
-    target_link_libraries(sfml-window PRIVATE EGL GLES)
-endif()
-
 if(SFML_OS_LINUX)
     sfml_find_package(UDev INCLUDE "UDEV_INCLUDE_DIR" LINK "UDEV_LIBRARIES")
     target_link_libraries(sfml-window PRIVATE UDev)

diff --git a/src/SFML/Window/EGLCheck.cpp b/src/SFML/Window/EGLCheck.cpp
@@ -28,6 +28,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/EGLCheck.hpp>
 #include <SFML/System/Err.hpp>
+#include <EGL/egl.h>
 
 
 namespace sf

diff --git a/src/SFML/Window/EGLCheck.hpp b/src/SFML/Window/EGLCheck.hpp
@@ -29,7 +29,6 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Config.hpp>
-#include <EGL/egl.h>
 #include <string>
 
 

diff --git a/src/SFML/Window/EglContext.hpp b/src/SFML/Window/EglContext.hpp
@@ -33,7 +33,11 @@
 #include <SFML/Window/EGLCheck.hpp>
 #include <SFML/Window/GlContext.hpp>
 #include <SFML/OpenGL.hpp>
-
+#include <SFML/Window/WindowStyle.hpp> // Prevent conflict with macro None from Xlib
+#include <EGL/egl.h>
+#ifdef SFML_SYSTEM_LINUX
+    #include <X11/Xlib.h>
+#endif
 
 namespace sf
 {