Permalink
Browse files

Dropped NaCl support.

  • Loading branch information...
mosra committed Aug 19, 2017
1 parent bb31182 commit 2145ae9b969f058e39bcaa008c7e5f6bab57189e
Showing with 116 additions and 4,745 deletions.
  1. +11 −24 CMakeLists.txt
  2. +0 −2 README.md
  3. +1 −8 doc/best-practices.dox
  4. +2 −52 doc/building.dox
  5. +3 −3 doc/changelog.dox
  6. +0 −2 doc/cmake.dox
  7. +0 −2 doc/mainpage.dox
  8. +0 −1 doc/opengl-support.dox
  9. +3 −3 doc/platform.dox
  10. +1 −10 modules/FindCorrade.cmake
  11. +1 −8 modules/FindMagnum.cmake
  12. +1 −4 modules/FindOpenGLES2.cmake
  13. +0 −65 package/archlinux/PKGBUILD-nacl-glibc
  14. +0 −67 package/archlinux/PKGBUILD-nacl-newlib
  15. +3 −47 src/Magnum/AbstractFramebuffer.cpp
  16. +0 −2 src/Magnum/AbstractFramebuffer.h
  17. +5 −38 src/Magnum/AbstractObject.cpp
  18. +3 −9 src/Magnum/AbstractQuery.cpp
  19. +4 −81 src/Magnum/AbstractShaderProgram.cpp
  20. +5 −44 src/Magnum/AbstractTexture.cpp
  21. +6 −41 src/Magnum/Buffer.cpp
  22. +11 −72 src/Magnum/Buffer.h
  23. +1 −1 src/Magnum/CMakeLists.txt
  24. +0 −3 src/Magnum/Context.cpp
  25. +3 −3 src/Magnum/Context.h
  26. +4 −56 src/Magnum/DebugOutput.cpp
  27. +0 −4 src/Magnum/Extensions.h
  28. +1 −7 src/Magnum/Framebuffer.cpp
  29. +0 −41 src/Magnum/Implementation/driverSpecific.cpp
  30. +1 −1 src/Magnum/Math/Complex.h
  31. +3 −3 src/Magnum/Math/Functions.h
  32. +1 −1 src/Magnum/Math/Test/FunctionsTest.cpp
  33. +6 −72 src/Magnum/Mesh.cpp
  34. +2 −6 src/Magnum/MeshView.cpp
  35. +0 −10 src/Magnum/OpenGL.h
  36. +8 −9 src/Magnum/OpenGLTester.h
  37. +2 −76 src/Magnum/Platform/CMakeLists.txt
  38. +1 −1 src/Magnum/Platform/Context.h
  39. +0 −276 src/Magnum/Platform/NaClApplication.cpp
  40. +0 −821 src/Magnum/Platform/NaClApplication.h
  41. +0 −43 src/Magnum/Platform/NaClApplication.js
  42. +0 −1 src/Magnum/Platform/Screen.h
  43. +0 −1 src/Magnum/Platform/ScreenedApplication.h
  44. +0 −125 src/Magnum/Platform/WindowlessNaClApplication.cpp
  45. +0 −356 src/Magnum/Platform/WindowlessNaClApplication.h
  46. +0 −41 src/Magnum/Platform/magnum-info-nacl.html
  47. +0 −6 src/Magnum/Platform/magnum-info-nacl.nmf
  48. +1 −28 src/Magnum/Platform/magnum-info.cpp
  49. +0 −14 src/Magnum/Renderbuffer.cpp
  50. +1 −2 src/Magnum/Renderbuffer.h
  51. +1 −8 src/Magnum/Renderer.cpp
  52. +6 −6 src/Magnum/Shader.cpp
  53. +0 −29 src/Magnum/Test/BufferGLTest.cpp
  54. +0 −2 src/Magnum/Text/CMakeLists.txt
  55. +1 −21 src/Magnum/Text/Renderer.cpp
  56. +0 −6 src/Magnum/Text/Renderer.h
  57. +1 −6 src/Magnum/Text/Test/RendererGLTest.cpp
  58. +0 −2 src/Magnum/Text/fontconverter.cpp
  59. +0 −2 src/Magnum/TextureTools/CMakeLists.txt
  60. +0 −2 src/Magnum/TextureTools/distancefieldconverter.cpp
  61. +1 −1 src/Magnum/TimeQuery.h
  62. +2 −2 src/Magnum/Timeline.h
  63. +4 −6 src/MagnumExternal/OpenGL/GLES2/CMakeLists.txt
  64. +0 −60 src/MagnumExternal/OpenGL/GLES2/NaCl/flextGLNaCl.h.template
  65. +3 −5 src/MagnumExternal/OpenGL/GLES2/README.md
  66. +0 −1,989 src/MagnumExternal/OpenGL/GLES2/flextGLNaCl.h
  67. +1 −1 src/MagnumExternal/OpenGL/GLES3/CMakeLists.txt
  68. +1 −4 src/MagnumExternal/OpenGL/KHR/CMakeLists.txt
View
@@ -51,9 +51,9 @@ find_package(Corrade REQUIRED PluginManager Utility)
include(CMakeDependentOption)
# If targeting iOS, Android, NaCl, Emscripten or Windows RT, set explicit
# OpenGL ES support
if(NOT CORRADE_TARGET_IOS AND NOT CORRADE_TARGET_ANDROID AND NOT CORRADE_TARGET_EMSCRIPTEN AND NOT CORRADE_TARGET_NACL AND NOT CORRADE_TARGET_WINDOWS_RT)
# If targeting iOS, Android, Emscripten or Windows RT, set explicit OpenGL ES
# support
if(NOT CORRADE_TARGET_IOS AND NOT CORRADE_TARGET_ANDROID AND NOT CORRADE_TARGET_EMSCRIPTEN AND NOT CORRADE_TARGET_WINDOWS_RT)
option(TARGET_GLES "Build for OpenGL ES / WebGL" OFF)
else()
set(TARGET_GLES ON)
@@ -63,8 +63,8 @@ cmake_dependent_option(TARGET_GLES2 "Build for OpenGL ES 2 / WebGL 1.0" ON "TARG
cmake_dependent_option(TARGET_DESKTOP_GLES "Build for OpenGL ES on desktop" OFF "TARGET_GLES" OFF)
option(TARGET_HEADLESS "Build command-line utilities for use on a headless machines" OFF)
# Magnum Info (currently only using GLX, CGL, WGL/EGL on Windows or on NaCl)
if(CORRADE_TARGET_UNIX OR CORRADE_TARGET_NACL OR CORRADE_TARGET_WINDOWS)
# Magnum Info (currently only using GLX, CGL or WGL/EGL on Windows)
if(CORRADE_TARGET_UNIX OR CORRADE_TARGET_WINDOWS)
option(WITH_MAGNUMINFO "Build magnum-info utility" OFF)
endif()
@@ -101,18 +101,13 @@ cmake_dependent_option(WITH_AL_INFO "Build magnum-al-info utility" OFF "WITH_AUD
# EGL context and windowless EGL application, available everywhere except on
# platforms which don't support extension loading
if(NOT CORRADE_TARGET_EMSCRIPTEN AND NOT CORRADE_TARGET_NACL)
if(NOT CORRADE_TARGET_EMSCRIPTEN)
cmake_dependent_option(WITH_WINDOWLESSEGLAPPLICATION "Build WindowlessEglApplication library" OFF "NOT TARGET_GLES OR TARGET_DESKTOP_GLES OR NOT WITH_MAGNUMINFO" ON)
option(WITH_EGLCONTEXT "Build EglContext library" OFF)
endif()
# NaCl-specific application libraries
if(CORRADE_TARGET_NACL)
option(WITH_NACLAPPLICATION "Build NaClApplication library" OFF)
cmake_dependent_option(WITH_WINDOWLESSNACLAPPLICATION "Build WindowlessNaClApplication library" OFF "NOT WITH_MAGNUMINFO" ON)
# Android-specific application libraries
elseif(CORRADE_TARGET_ANDROID)
if(CORRADE_TARGET_ANDROID)
option(WITH_ANDROIDAPPLICATION "Build AndroidApplication library" OFF)
# iOS-specific application libraries
@@ -144,7 +139,7 @@ elseif(CORRADE_TARGET_WINDOWS)
endif()
# Platform-independent (almost) application libraries
if(NOT CORRADE_TARGET_NACL AND NOT CORRADE_TARGET_ANDROID)
if(NOT CORRADE_TARGET_ANDROID)
option(WITH_GLFWAPPLICATION "Build GlfwApplication library")
cmake_dependent_option(WITH_GLUTAPPLICATION "Build GlutApplication library" OFF "NOT TARGET_GLES" OFF)
option(WITH_SDL2APPLICATION "Build Sdl2Application library" OFF)
@@ -175,20 +170,12 @@ if(BUILD_TESTS)
endif()
# OpenGLTester library, built by default only if GL tests are enabled
if(NOT CORRADE_TARGET_NACL AND NOT CORRADE_TARGET_ANDROID AND NOT CORRADE_TARGET_EMSCRIPTEN)
if(NOT CORRADE_TARGET_ANDROID AND NOT CORRADE_TARGET_EMSCRIPTEN)
cmake_dependent_option(WITH_OPENGLTESTER "Build OpenGLTester library" OFF "NOT BUILD_GL_TESTS" ON)
endif()
# If targeting NaCl, set explicit OpenGL ES 2.0 support. For Android and
# Emscripten the decision between ES 2.0 / WebGL 1.0 and ES 3.0 / WebGL 2.0
# must be done by the user.
if(CORRADE_TARGET_NACL)
set(TARGET_GLES2 ON)
endif()
# NaCl newlib toolchain supports only static linking, dynamic linking is
# meaningless on Emscripten and too inconvenient on Android
if(CORRADE_TARGET_NACL_NEWLIB OR CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID)
# Dynamic linking is meaningless on Emscripten and too inconvenient on Android
if(CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID)
set(BUILD_STATIC ON)
set(BUILD_PLUGINS_STATIC ON)
endif()
View
@@ -59,8 +59,6 @@ Platforms:
* **iOS** (through SDL2 toolkit) [![Build Status](https://travis-ci.org/mosra/magnum.svg?branch=master)](https://travis-ci.org/mosra/magnum)
* **Android** 2.3 (API Level 9) and higher [![Build Status](https://travis-ci.org/mosra/magnum.svg?branch=master)](https://travis-ci.org/mosra/magnum)
* **Windows RT** (Store/Phone) using ANGLE (through SDL2 toolkit) [![Build Status](https://ci.appveyor.com/api/projects/status/5b477m034cfaskse/branch/master?svg=true)](https://ci.appveyor.com/project/mosra/magnum/branch/master)
* **Google Chrome** (through [Native Client](https://developers.google.com/native-client/),
both `newlib` and `glibc` toolchains are supported)
* **HTML5/JavaScript** (through [Emscripten](https://github.com/kripken/emscripten/wiki)) [![Build Status](https://travis-ci.org/mosra/magnum.svg?branch=master)](https://travis-ci.org/mosra/magnum)
FEATURES
View
@@ -71,7 +71,7 @@ information.
- [Best Practices for Working with Texture Data](http://developer.apple.com/library/ios/#documentation/3DDrawing/Conceptual/OpenGLES_ProgrammingGuide/TechniquesForWorkingWithTextureData/TechniquesForWorkingWithTextureData.html)
- [Best Practices for Shaders](http://developer.apple.com/library/ios/#documentation/3DDrawing/Conceptual/OpenGLES_ProgrammingGuide/BestPracticesforShaders/BestPracticesforShaders.html#//apple_ref/doc/uid/TP40008793-CH7-SW3)
@subsection best-practices-angle ANGLE (WebGL, NaCl)
@subsection best-practices-angle ANGLE (WebGL)
- [WebGL Insights -- ANGLE](https://books.google.cz/books?id=6crECQAAQBAJ&lpg=PP1&pg=PA3&redir_esc=y#v=onepage&q&f=true)
@@ -85,13 +85,6 @@ buffer attachments. See @ref Buffer, @ref Framebuffer,
@ref Renderer::setStencilFunction(), @ref Renderer::setStencilMask() and
@ref Renderer::setBlendFunction() documentation for more information.
@subsection best-practices-nacl Google Chrome Native Client
- [Best practices for 3D graphics](https://developers.google.com/native-client/beta/devguide/coding/3D-graphics#best-practices)
Similarly to WebGL, buffers in NaCl implementation need to be bound only to one
unique target. See @ref Buffer class documentation for more information.
@section best-practices-hw Hardware-specific
@subsection best-practices-intel Intel hardware
View
@@ -208,14 +208,12 @@ platform best:
- `WITH_GLFWAPPLICATION` - @ref Platform::GlfwApplication "GlfwApplication"
- `WITH_GLUTAPPLICATION` - @ref Platform::GlutApplication "GlutApplication"
- `WITH_GLXAPPLICATION` - @ref Platform::GlxApplication "GlxApplication"
- `WITH_NACLAPPLICATION` - @ref Platform::NaClApplication "NaClApplication"
- `WITH_SDL2APPLICATION` - @ref Platform::Sdl2Application "Sdl2Application"
- `WITH_XEGLAPPLICATION` - @ref Platform::XEglApplication "XEglApplication"
- `WITH_WINDOWLESSCGLAPPLICATION` - @ref Platform::WindowlessCglApplication "WindowlessCglApplication"
- `WITH_WINDOWLESSEGLAPPLICATION` - @ref Platform::WindowlessEglApplication "WindowlessEglApplication"
- `WITH_WINDOWLESSGLXAPPLICATION` - @ref Platform::WindowlessGlxApplication "WindowlessGlxApplication"
- `WITH_WINDOWLESSIOSAPPLICATION` - @ref Platform::WindowlessIosApplication "WindowlessIosApplication"
- `WITH_WINDOWLESSNACLAPPLICATION` - @ref Platform::WindowlessNaClApplication "WindowlessNaClApplication"
- `WITH_WINDOWLESSWGLAPPLICATION` - @ref Platform::WindowlessWglApplication "WindowlessWglApplication"
- `WITH_WINDOWLESSWINDOWSEGLAPPLICATION` - @ref Platform::WindowlessWindowsEglApplication "WindowlessWindowsEglApplication"
@@ -308,8 +306,8 @@ e.g.:
Platforms which have windowless GL context creation implemented (currently all
platforms except @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten",
@ref CORRADE_TARGET_NACL "NaCl", @ref CORRADE_TARGET_WINDOWS_RT "Windows RT"
and @ref CORRADE_TARGET_ANDROID "Android") can build also tests for OpenGL
@ref CORRADE_TARGET_WINDOWS_RT "Windows RT" and
@ref CORRADE_TARGET_ANDROID "Android") can build also tests for OpenGL
functionality. You can enable them with `BUILD_GL_TESTS`. All GL tests are
suffixed with `GLTest` so they can be also selectively included/excluded when
running CTest, e.g.:
@@ -485,54 +483,6 @@ hierarchy and specify path where Corrade is installed in `CMAKE_PREFIX_PATH`.
Then you can install the package using `cmake --build . --target install` to
make it available for depending projects.
@subsection building-cross-nacl Crosscompiling for Google Chrome Native Client
You will need [Native Client SDK](https://developers.google.com/native-client/beta/sdk/download).
Tested version is `pepper_22`.
You can choose from either `glibc` or `newlib` toolchain. `Newlib` supports
only static linking, thus `BUILD_STATIC` is always enabled. Don't forget to
adapt `NACL_PREFIX` variable in `generic/NaCl-*-x86-32.cmake` and
`generic/NaCl-*-x86-64.cmake` to path where your SDK is installed. Default is
`/usr/nacl`. You may need to adapt also `NACL_TOOLCHAIN_PATH` so CMake is able
to find the compiler. NaCl currently supports only OpenGL ES 2, thus
`TARGET_GLES` and `TARGET_GLES2` is always enabled.
Then create build directories for x86-32 and x86-64 and run cmake and build
command in them. Be sure to adapt `CMAKE_INSTALL_PREFIX` to the same value as
in `NACL_PREFIX` in toolchain file and specify path where Corrade is installed
in `CMAKE_PREFIX_PATH`.
mkdir build-nacl-x86-32 && cd build-nacl-x86-32
cmake .. \
-DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/NaCl-newlib-x86-32.cmake" \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH=/usr/nacl \
-DCMAKE_INSTALL_PREFIX=/usr/nacl \
-DWITH_NACLAPPLICATION=ON \
-DLIB_SUFFIX=/32
cmake --build .
mkdir build-nacl-x86-64 && cd build-nacl-x86-64
cmake .. \
-DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/NaCl-newlib-x86-64.cmake" \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH=/usr/nacl \
-DCMAKE_INSTALL_PREFIX=/usr/nacl \
-DWITH_NACLAPPLICATION=ON
cmake --build .
Then you can install both versions using `cmake --build . --target install` to
make them available for depending projects. The headers are shared by both
versions.
For ArchLinux there are also prepared package files in `package/archlinux`,
named `PKGBUILD-nacl-glibc` and `PKGBUILD-nacl-newlib`, see
@ref building-packages-arch "above" for more information.
See @ref Platform::NaClApplication documentation for more information about
building your projects for Google Chrome Native Client.
@subsection building-cross-emscripten Crosscompiling for Emscripten
You will need [Emscripten](https://github.com/kripken/emscripten/wiki/Tutorial)
View
@@ -33,6 +33,7 @@ namespace Magnum {
## De­pen­den­cy changes
- Completely removed NaCl support (see https://blog.chromium.org/2017/05/goodbye-pnacl-hello-webassembly.html)
- Dropped support for the old MinGW32 (only MinGW-w64 is supported now)
- Bumped minimal CMake version to 2.8.12
- Removed support for macOS 10.8 and older
@@ -223,8 +224,7 @@ namespace Magnum {
classes that manage OpenGL context to make threaded context creation
possible
- First-class support for scroll events in
@ref Platform::Sdl2Application::MouseScrollEvent and
@ref Platform::NaClApplication::MouseScrollEvent
@ref Platform::Sdl2Application::MouseScrollEvent
- Added @ref Platform::Sdl2Application::MouseEvent::clickCount()
- Added @ref Platform::Sdl2Application::multiGestureEvent()
- Exposing key repeat in
@@ -414,7 +414,7 @@ namespace Magnum {
- Fixed WebGL context creation on Internet Explorer, it claims to have
version 0.94
- Fixed random browser-specific issues by avoiding the use of XHTML in
Emscripten and NaCl builds
Emscripten builds
- @ref Trade::ObjImporter "ObjImporter" plugin now opens the files as binary
to avoid line ending issues
- Various compatibility updates to the @ref Shaders library
View
@@ -102,14 +102,12 @@ Platform namespace is split into more components:
- `GlfwApplication` -- @ref Platform::GlfwApplication "GlfwApplication"
- `GlutApplication` -- @ref Platform::GlutApplication "GlutApplication"
- `GlxApplication` -- @ref Platform::GlxApplication "GlxApplication"
- `NaClApplication` -- @ref Platform::NaClApplication "NaClApplication"
- `Sdl2Application` -- @ref Platform::Sdl2Application "Sdl2Application"
- `XEglApplication` -- @ref Platform::XEglApplication "XEglApplication"
- `WindowlessCglApplication` -- @ref Platform::WindowlessCglApplication "WindowlessCglApplication"
- `WindowlessEglApplication` -- @ref Platform::WindowlessEglApplication "WindowlessEglApplication"
- `WindowlessGlxApplication` -- @ref Platform::WindowlessGlxApplication "WindowlessGlxApplication"
- `WindowlessIosApplication` -- @ref Platform::WindowlessIosApplication "WindowlessIosApplication"
- `WindowlessNaClApplication` -- @ref Platform::WindowlessNaClApplication "WindowlessNaClApplication"
- `WindowlessWglApplication` -- @ref Platform::WindowlessWglApplication "WindowlessWglApplication"
- `WindowlessWindowsEglApplication` -- @ref Platform::WindowlessWindowsEglApplication "WindowlessWindowsEglApplication"
View
@@ -82,8 +82,6 @@ Platforms:
- **OS X**, **iOS** (through SDL2 or GLFW toolkit)
- **Android** 2.3 (API Level 9) and higher
- **Windows RT** (Store/Phone) using ANGLE (through SDL2 toolkit)
- **Google Chrome** (through [Native Client](https://developers.google.com/native-client/),
both `newlib` and `glibc` toolchains are supported)
- **HTML5/JavaScript** (through [Emscripten](https://github.com/kripken/emscripten/wiki))
@section mainpage-features Features
View
@@ -351,7 +351,6 @@ Extension | Status
@extension{APPLE,texture_format_BGRA8888} | done
@extension{ARM,shader_framebuffer_fetch} | missing renderer setup and limit query
@extension{ARM,shader_framebuffer_fetch_depth_stencil} | done (shading language only)
@extension{CHROMIUM,map_sub} (NaCl only) | only buffer mapping
@extension{EXT,texture_filter_anisotropic} | done
@extension{EXT,texture_format_BGRA8888} | done
@extension{EXT,read_format_bgra} | done
View
@@ -296,12 +296,12 @@ find particular `*Context` library, add its include dir and then link to it.
These platform-specific libraries are available:
- `CglContext` -- CGL context (Mac OS X)
- `EglContext` -- EGL context (everywhere except Emscripten and NaCl)
- `EglContext` -- EGL context (everywhere except Emscripten)
- `GlxContext` -- GLX context (X11-based Unix)
- `WglContext` -- WGL context (Windows)
Systems not listed here (such as Emscripten or NaCl) don't need any `Context`
library, because dynamic function pointer loading is not available on these.
Systems not listed here (such as Emscripten) don't need any `Context` library,
because dynamic function pointer loading is not available on these.
For example, when you create the OpenGL context using GLX, you need to find
`GlxContext` component, and link to `Magnum::GlxContext` target. Similarly to
View
@@ -80,12 +80,6 @@
# CORRADE_TARGET_IOS_SIMULATOR - Defined if compiled for iOS Simulator
# CORRADE_TARGET_WINDOWS - Defined if compiled for Windows
# CORRADE_TARGET_WINDOWS_RT - Defined if compiled for Windows RT
# CORRADE_TARGET_NACL - Defined if compiled for Google Chrome Native
# Client
# CORRADE_TARGET_NACL_NEWLIB - Defined if compiled for Google Chrome Native
# Client with `newlib` toolchain
# CORRADE_TARGET_NACL_GLIBC - Defined if compiled for Google Chrome Native
# Client with `glibc` toolchain
# CORRADE_TARGET_EMSCRIPTEN - Defined if compiled for Emscripten
# CORRADE_TARGET_ANDROID - Defined if compiled for Android
# CORRADE_TESTSUITE_TARGET_XCTEST - Defined if TestSuite is targetting Xcode
@@ -294,9 +288,6 @@ set(_corradeFlags
TARGET_IOS_SIMULATOR
TARGET_WINDOWS
TARGET_WINDOWS_RT
TARGET_NACL
TARGET_NACL_NEWLIB
TARGET_NACL_GLIBC
TARGET_EMSCRIPTEN
TARGET_ANDROID
TESTSUITE_TARGET_XCTEST
@@ -415,7 +406,7 @@ foreach(_component ${Corrade_FIND_COMPONENTS})
# PluginManager library
if(_component STREQUAL PluginManager)
# At least static build needs this
if(CORRADE_TARGET_UNIX OR CORRADE_TARGET_NACL_GLIBC)
if(CORRADE_TARGET_UNIX)
set_property(TARGET Corrade::${_component} APPEND PROPERTY
INTERFACE_LINK_LIBRARIES ${CMAKE_DL_LIBS})
endif()
View
@@ -53,14 +53,12 @@
# GlfwApplication - GLFW application
# GlutApplication - GLUT application
# GlxApplication - GLX application
# NaClApplication - NaCl application
# Sdl2Application - SDL2 application
# XEglApplication - X/EGL application
# WindowlessCglApplication - Windowless CGL application
# WindowlessEglApplication - Windowless EGL application
# WindowlessGlxApplication - Windowless GLX application
# WindowlessIosApplication - Windowless iOS application
# WindowlessNaClApplication - Windowless NaCl application
# WindowlessWglApplication - Windowless WGL application
# WindowlessWindowsEglApplication - Windowless Windows/EGL application
# CglContext - CGL context
@@ -389,7 +387,7 @@ endif()
# Component distinction (listing them explicitly to avoid mistakes with finding
# components from other repositories)
set(_MAGNUM_LIBRARY_COMPONENTS "^(Audio|DebugTools|MeshTools|Primitives|SceneGraph|Shaders|Shapes|Text|TextureTools|AndroidApplication|GlfwApplication|GlutApplication|GlxApplication|NaClApplication|Sdl2Application|XEglApplication|WindowlessCglApplication|WindowlessEglApplication|WindowlessGlxApplication|WindowlessIosApplication|WindowlessNaClApplication|WindowlessWglApplication|WindowlessWindowsEglApplication|CglContext|EglContext|GlxContext|WglContext|OpenGLTester)$")
set(_MAGNUM_LIBRARY_COMPONENTS "^(Audio|DebugTools|MeshTools|Primitives|SceneGraph|Shaders|Shapes|Text|TextureTools|AndroidApplication|GlfwApplication|GlutApplication|GlxApplication|Sdl2Application|XEglApplication|WindowlessCglApplication|WindowlessEglApplication|WindowlessGlxApplication|WindowlessIosApplication|WindowlessWglApplication|WindowlessWindowsEglApplication|CglContext|EglContext|GlxContext|WglContext|OpenGLTester)$")
set(_MAGNUM_PLUGIN_COMPONENTS "^(MagnumFont|MagnumFontConverter|ObjImporter|TgaImageConverter|TgaImporter|WavAudioImporter)$")
set(_MAGNUM_EXECUTABLE_COMPONENTS "^(distancefieldconverter|fontconverter|imageconverter|info|al-info)$")
@@ -537,11 +535,6 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
set_property(TARGET Magnum::${_component} APPEND PROPERTY
INTERFACE_LINK_LIBRARIES SDL2::SDL2)
# (Windowless) NaCl application dependencies
elseif(_component STREQUAL NaClApplication OR _component STREQUAL WindowlessNaClApplication)
set_property(TARGET Magnum::${_component} APPEND PROPERTY
INTERFACE_LINK_LIBRARIES ppapi_cpp ppapi)
# (Windowless) GLX application dependencies
elseif(_component STREQUAL GlxApplication OR _component STREQUAL WindowlessGlxApplication)
find_package(X11)
@@ -48,10 +48,7 @@ if(NOT CORRADE_TARGET_EMSCRIPTEN)
libGLESv2
# iOS
OpenGLES
# NaCl
ppapi_gles2)
OpenGLES)
set(OPENGLES2_LIBRARY_NEEDED OPENGLES2_LIBRARY)
endif()
Oops, something went wrong.

0 comments on commit 2145ae9

Please sign in to comment.