Make Linux/Windows code for windowless apps on ES more consistent.

src/Magnum/Platform/CMakeLists.txt

@@ -758,10 +758,10 @@ if(WITH_MAGNUMINFO)
             target_link_libraries(magnum-info MagnumWindowlessGlxApplication)
         endif()
     elseif(CORRADE_TARGET_WINDOWS)
-        if(NOT MAGNUM_TARGET_GLES OR MAGNUM_TARGET_DESKTOP_GLES)
+        if(MAGNUM_TARGET_GLES AND NOT MAGNUM_TARGET_DESKTOP_GLES)
-            target_link_libraries(magnum-info MagnumWindowlessWglApplication)
-        else()
             target_link_libraries(magnum-info MagnumWindowlessWindowsEglApplication)
+        else()
+            target_link_libraries(magnum-info MagnumWindowlessWglApplication)
         endif()
     else()
         message(FATAL_ERROR "magnum-info is not available on this platform. Set WITH_MAGNUMINFO to OFF to skip building it.")

src/Magnum/Platform/magnum-info.cpp

@@ -72,10 +72,10 @@
 #include "Magnum/Platform/WindowlessGlxApplication.h"
 #endif
 #elif defined(CORRADE_TARGET_WINDOWS)
-#if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_DESKTOP_GLES)
+#if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_DESKTOP_GLES)
-#include "Magnum/Platform/WindowlessWglApplication.h"
-#else
 #include "Magnum/Platform/WindowlessWindowsEglApplication.h"
+#else
+#include "Magnum/Platform/WindowlessWglApplication.h"
 #endif
 #else
 #error no windowless application available on this platform

src/Magnum/Text/CMakeLists.txt

@@ -78,10 +78,10 @@ if(WITH_FONTCONVERTER)
             target_link_libraries(magnum-fontconverter MagnumWindowlessGlxApplication)
         endif()
     elseif(CORRADE_TARGET_WINDOWS)
-        if(NOT MAGNUM_TARGET_GLES OR MAGNUM_TARGET_DESKTOP_GLES)
+        if(MAGNUM_TARGET_GLES AND NOT MAGNUM_TARGET_DESKTOP_GLES)
-            target_link_libraries(magnum-fontconverter MagnumWindowlessWglApplication)
-        else()
             target_link_libraries(magnum-fontconverter MagnumWindowlessWindowsEglApplication)
+        else()
+            target_link_libraries(magnum-fontconverter MagnumWindowlessWglApplication)
         endif()
     else()
         message(FATAL_ERROR "magnum-fontconverter is not available on this platform. Set WITH_FONTCONVERTER to OFF to suppress this warning.")

src/Magnum/Text/fontconverter.cpp

@@ -47,10 +47,10 @@
 #include "Magnum/Platform/WindowlessGlxApplication.h"
 #endif
 #elif defined(CORRADE_TARGET_WINDOWS)
-#if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_DESKTOP_GLES)
+#if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_DESKTOP_GLES)
-#include "Magnum/Platform/WindowlessWglApplication.h"
-#else
 #include "Magnum/Platform/WindowlessWindowsEglApplication.h"
+#else
+#include "Magnum/Platform/WindowlessWglApplication.h"
 #endif
 #else
 #error no windowless application available on this platform

src/Magnum/TextureTools/CMakeLists.txt

@@ -68,10 +68,10 @@ if(WITH_DISTANCEFIELDCONVERTER)
             target_link_libraries(magnum-distancefieldconverter MagnumWindowlessGlxApplication)
         endif()
     elseif(CORRADE_TARGET_WINDOWS)
-        if(NOT MAGNUM_TARGET_GLES OR MAGNUM_TARGET_DESKTOP_GLES)
+        if(MAGNUM_TARGET_GLES AND NOT MAGNUM_TARGET_DESKTOP_GLES)
-            target_link_libraries(magnum-distancefieldconverter MagnumWindowlessWglApplication)
-        else()
             target_link_libraries(magnum-distancefieldconverter MagnumWindowlessWindowsEglApplication)
+        else()
+            target_link_libraries(magnum-distancefieldconverter MagnumWindowlessWglApplication)
         endif()
     else()
         message(FATAL_ERROR "magnum-distancefieldconverter is not available on this platform. Set WITH_DISTANCEFIELDCONVERTER to OFF to suppress this warning.")

src/Magnum/TextureTools/distancefieldconverter.cpp

@@ -53,10 +53,10 @@
 #include "Magnum/Platform/WindowlessGlxApplication.h"
 #endif
 #elif defined(CORRADE_TARGET_WINDOWS)
-#if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_DESKTOP_GLES)
+#if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_DESKTOP_GLES)
-#include "Magnum/Platform/WindowlessWglApplication.h"
-#else
 #include "Magnum/Platform/WindowlessWindowsEglApplication.h"
+#else
+#include "Magnum/Platform/WindowlessWglApplication.h"
 #endif
 #else
 #error no windowless application available on this platform