diff --git a/doc/python/conf.py b/doc/python/conf.py index 44140fe..d843b10 100644 --- a/doc/python/conf.py +++ b/doc/python/conf.py @@ -25,7 +25,7 @@ import magnum.trade # So the doc see everything # TODO: use just +=, m.css should reorder this on its own corrade.__all__ = ['containers', 'pluginmanager', 'BUILD_STATIC', 'BUILD_MULTITHREADED', 'TARGET_UNIX', 'TARGET_APPLE', 'TARGET_IOS', 'TARGET_IOS_SIMULATOR', 'TARGET_WINDOWS', 'TARGET_WINDOWS_RT', 'TARGET_EMSCRIPTEN', 'TARGET_ANDROID'] -magnum.__all__ = ['math', 'gl', 'meshtools', 'platform', 'primitives', 'shaders', 'scenegraph', 'text', 'trade', 'BUILD_STATIC', 'TARGET_GL', 'TARGET_GLES', 'TARGET_GLES2', 'TARGET_WEBGL', 'TARGET_VK'] + magnum.__all__ +magnum.__all__ = ['math', 'gl', 'meshtools', 'platform', 'primitives', 'shaders', 'scenegraph', 'text', 'trade', 'BUILD_STATIC', 'TARGET_GL', 'TARGET_GLES', 'TARGET_GLES2', 'TARGET_WEBGL', 'TARGET_EGL', 'TARGET_VK'] + magnum.__all__ # hide values of the preprocessor defines to avoid confusion by assigning a # class without __repr__ to them @@ -46,6 +46,7 @@ magnum.TARGET_GL = DoNotPrintValue() magnum.TARGET_GLES = DoNotPrintValue() magnum.TARGET_GLES2 = DoNotPrintValue() magnum.TARGET_WEBGL = DoNotPrintValue() +magnum.TARGET_EGL = DoNotPrintValue() magnum.TARGET_VK = DoNotPrintValue() # TODO ugh... can this be expressed directly in pybind? diff --git a/doc/python/magnum.rst b/doc/python/magnum.rst index 5fc2748..6e6992d 100644 --- a/doc/python/magnum.rst +++ b/doc/python/magnum.rst @@ -34,6 +34,7 @@ :data TARGET_GLES: OpenGL ES target :data TARGET_GLES2: OpenGL ES 2.0 target :data TARGET_WEBGL: WebGL target + :data TARGET_EGL: EGL target :data TARGET_VK: Vulkan interoperability .. py:class:: magnum.Image1D diff --git a/package/ci/appveyor-desktop-gles.bat b/package/ci/appveyor-desktop-gles.bat index 97af170..f48e3ce 100644 --- a/package/ci/appveyor-desktop-gles.bat +++ b/package/ci/appveyor-desktop-gles.bat @@ -43,7 +43,7 @@ cmake .. ^ -DMAGNUM_BUILD_STATIC=%BUILD_STATIC% ^ -DMAGNUM_TARGET_GLES=ON ^ -DMAGNUM_TARGET_GLES2=%TARGET_GLES2% ^ - -DMAGNUM_TARGET_DESKTOP_GLES=ON ^ + -DMAGNUM_TARGET_EGL=OFF ^ -DMAGNUM_WITH_AUDIO=OFF ^ -DMAGNUM_WITH_DEBUGTOOLS=OFF ^ -DMAGNUM_WITH_GL=ON ^ diff --git a/src/python/magnum/magnum.cpp b/src/python/magnum/magnum.cpp index 8b7e86e..3dca3c9 100644 --- a/src/python/magnum/magnum.cpp +++ b/src/python/magnum/magnum.cpp @@ -191,9 +191,13 @@ void magnum(py::module_& m) { false #endif ; - /* TARGET_DESKTOP_GLES, TARGET_HEADLESS skipped as they make sense only - on native side (affecting what the builtin utilities use), not really in - Python */ + m.attr("TARGET_EGL") = + #ifdef MAGNUM_TARGET_EGL + true + #else + false + #endif + ; m.attr("TARGET_VK") = #ifdef MAGNUM_TARGET_VK true