diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake index 9f7d19a59..ce70def76 100644 --- a/modules/FindMagnum.cmake +++ b/modules/FindMagnum.cmake @@ -510,8 +510,6 @@ foreach(_component ${Magnum_FIND_COMPONENTS}) # Android application dependencies if(_component STREQUAL AndroidApplication) find_package(EGL) - set_property(TARGET Magnum::${_component} APPEND PROPERTY - INTERFACE_INCLUDE_DIRECTORIES ${ANDROID_NATIVE_APP_GLUE_INCLUDE_DIR}) set_property(TARGET Magnum::${_component} APPEND PROPERTY INTERFACE_LINK_LIBRARIES android EGL::EGL) diff --git a/src/Magnum/Platform/AndroidApplication.cpp b/src/Magnum/Platform/AndroidApplication.cpp index 62d450c78..f0303666a 100644 --- a/src/Magnum/Platform/AndroidApplication.cpp +++ b/src/Magnum/Platform/AndroidApplication.cpp @@ -27,6 +27,7 @@ #include #include +#include #include "Magnum/Version.h" #include "Magnum/Platform/Context.h" diff --git a/src/Magnum/Platform/AndroidApplication.h b/src/Magnum/Platform/AndroidApplication.h index 43d861078..06684402e 100644 --- a/src/Magnum/Platform/AndroidApplication.h +++ b/src/Magnum/Platform/AndroidApplication.h @@ -31,7 +31,6 @@ #include #include -#include #include "Magnum/Magnum.h" #include "Magnum/Tags.h" @@ -42,9 +41,13 @@ #error this file is available only on Android build #endif +#include + /* Undef Xlib nonsense which might get pulled in by EGL */ #undef None +struct android_app; + namespace Magnum { namespace Platform { /** @nosubgrouping