ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Don't ever attempt to think about CGL when building for GLES on Mac.

pull/525/head
Vladimír Vondruš 4 years ago
parent
031d1ceec3
commit
c36ed5e61d
8 changed files with 12 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      CMakeLists.txt
  2. 2
      doc/generated/CMakeLists.txt
  3. 2
      src/Magnum/GL/OpenGLTester.h
  4. 5
      src/Magnum/Platform/CMakeLists.txt
  5. 2
      src/Magnum/Platform/gl-info.cpp
  6. 2
      src/Magnum/Text/CMakeLists.txt
  7. 2
      src/Magnum/TextureTools/CMakeLists.txt
  8. 2
      src/Magnum/TextureTools/distancefieldconverter.cpp

4
CMakeLists.txt
Unescape View File

@ -147,7 +147,7 @@ elseif(CORRADE_TARGET_IOS)
option(WITH_WINDOWLESSIOSAPPLICATION "Build WindowlessIosApplication library" OFF)
# macOS-specific application libraries
elseif(CORRADE_TARGET_APPLE)
elseif(CORRADE_TARGET_APPLE AND NOT TARGET_GLES)
cmake_dependent_option(WITH_WINDOWLESSCGLAPPLICATION "Build WindowlessCglApplication library" OFF "NOT WITH_GL_INFO;NOT WITH_FONTCONVERTER;NOT WITH_DISTANCEFIELDCONVERTER" ON)
option(WITH_CGLCONTEXT "Build CglContext library" OFF)
@ -310,7 +310,7 @@ if(WITH_OPENGLTESTER)
elseif(CORRADE_TARGET_IOS)
set(WITH_WINDOWLESSIOSAPPLICATION ON)
set(OPENGLTESTER_APPLICATION MagnumWindowlessIosApplication)
elseif(CORRADE_TARGET_APPLE)
elseif(CORRADE_TARGET_APPLE AND NOT MAGNUM_TARGET_GLES)
set(WITH_WINDOWLESSCGLAPPLICATION ON)
set(OPENGLTESTER_APPLICATION MagnumWindowlessCglApplication)
elseif(CORRADE_TARGET_UNIX)

2
doc/generated/CMakeLists.txt
Unescape View File

@ -38,7 +38,7 @@ find_package(Magnum REQUIRED
set_directory_properties(PROPERTIES CORRADE_USE_PEDANTIC_FLAGS ON)
if(CORRADE_TARGET_APPLE)
if(CORRADE_TARGET_APPLE AND NOT MAGNUM_TARGET_GLES)
find_package(Magnum REQUIRED WindowlessCglApplication)
elseif(CORRADE_TARGET_UNIX)
find_package(Magnum REQUIRED WindowlessGlxApplication)

2
src/Magnum/GL/OpenGLTester.h
Unescape View File

@ -41,7 +41,7 @@
#include "Magnum/Platform/WindowlessEglApplication.h"
#elif defined(CORRADE_TARGET_IOS)
#include "Magnum/Platform/WindowlessIosApplication.h"
#elif defined(CORRADE_TARGET_APPLE)
#elif defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
#include "Magnum/Platform/WindowlessCglApplication.h"
#elif defined(CORRADE_TARGET_UNIX)
#if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_DESKTOP_GLES)

5
src/Magnum/Platform/CMakeLists.txt
Unescape View File

@ -675,6 +675,9 @@ if(WITH_WINDOWLESSCGLAPPLICATION)
if(NOT TARGET_GL)
message(SEND_ERROR "WindowlessCglApplication is available only if TARGET_GL is enabled")
endif()
if(TARGET_GLES)
message(SEND_ERROR "WindowlessCglApplication is not available if TARGET_GLES is enabled")
endif()
set(NEED_CGLCONTEXT 1)
@ -963,7 +966,7 @@ if(WITH_GL_INFO)
target_link_libraries(magnum-gl-info PRIVATE MagnumWindowlessEglApplication)
elseif(CORRADE_TARGET_IOS)
target_link_libraries(magnum-gl-info PRIVATE MagnumWindowlessIosApplication)
elseif(CORRADE_TARGET_APPLE)
elseif(CORRADE_TARGET_APPLE AND NOT MAGNUM_TARGET_GLES)
target_link_libraries(magnum-gl-info PRIVATE MagnumWindowlessCglApplication)
elseif(CORRADE_TARGET_UNIX)
if(MAGNUM_TARGET_GLES AND NOT MAGNUM_TARGET_DESKTOP_GLES)

2
src/Magnum/Platform/gl-info.cpp
Unescape View File

@ -63,7 +63,7 @@
#include "Magnum/Platform/WindowlessEglApplication.h"
#elif defined(CORRADE_TARGET_IOS)
#include "Magnum/Platform/WindowlessIosApplication.h"
#elif defined(CORRADE_TARGET_APPLE)
#elif defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
#include "Magnum/Platform/WindowlessCglApplication.h"
#elif defined(CORRADE_TARGET_UNIX)
#if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_DESKTOP_GLES)

2
src/Magnum/Text/CMakeLists.txt
Unescape View File

@ -120,7 +120,7 @@ if(WITH_FONTCONVERTER)
target_link_libraries(magnum-fontconverter PRIVATE MagnumWindowlessEglApplication)
elseif(CORRADE_TARGET_IOS)
target_link_libraries(magnum-fontconverter PRIVATE MagnumWindowlessIosApplication)
elseif(CORRADE_TARGET_APPLE)
elseif(CORRADE_TARGET_APPLE AND NOT MAGNUM_TARGET_GLES)
target_link_libraries(magnum-fontconverter PRIVATE MagnumWindowlessCglApplication)
elseif(CORRADE_TARGET_UNIX)
if(MAGNUM_TARGET_GLES AND NOT MAGNUM_TARGET_DESKTOP_GLES)

2
src/Magnum/TextureTools/CMakeLists.txt
Unescape View File

@ -88,7 +88,7 @@ if(WITH_DISTANCEFIELDCONVERTER)
target_link_libraries(magnum-distancefieldconverter PRIVATE MagnumWindowlessEglApplication)
elseif(CORRADE_TARGET_IOS)
target_link_libraries(magnum-distancefieldconverter PRIVATE MagnumWindowlessIosApplication)
elseif(CORRADE_TARGET_APPLE)
elseif(CORRADE_TARGET_APPLE AND NOT MAGNUM_TARGET_GLES)
target_link_libraries(magnum-distancefieldconverter PRIVATE MagnumWindowlessCglApplication)
elseif(CORRADE_TARGET_UNIX)
if(MAGNUM_TARGET_GLES AND NOT MAGNUM_TARGET_DESKTOP_GLES)

2
src/Magnum/TextureTools/distancefieldconverter.cpp
Unescape View File

@ -46,7 +46,7 @@
#include "Magnum/Platform/WindowlessEglApplication.h"
#elif defined(CORRADE_TARGET_IOS)
#include "Magnum/Platform/WindowlessIosApplication.h"
#elif defined(CORRADE_TARGET_APPLE)
#elif defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
#include "Magnum/Platform/WindowlessCglApplication.h"
#elif defined(CORRADE_TARGET_UNIX)
#if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_DESKTOP_GLES)

Write Preview
Loading…
Cancel
Save