jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into improve-cpu-check-error-msg

Browse source
This commit is contained in:
Simon Fels 2018-07-23 11:14:08 -04:00 • committed by GitHub
commit 3f661ca0e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -76,6 +76,8 @@ pkg_check_modules(LIBSYSTEMD libsystemd REQUIRED)
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMIR_SUPPORT")
# endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMESA_EGL_NO_X11_HEADERS")
#####################################################################
# Enable code coverage calculation with gcov/gcovr/lcov
# Usage:

4
src/anbox/platform/sdl/window.cpp
View file

@ -83,6 +83,10 @@ Window::Window(const std::shared_ptr<Renderer> &renderer,
native_display_ = static_cast<EGLNativeDisplayType>(info.info.x11.display);
native_window_ = static_cast<EGLNativeWindowType>(info.info.x11.window);
break;
case SDL_SYSWM_WAYLAND:
native_display_ = static_cast<EGLNativeDisplayType>(info.info.wl.display);
native_window_ = reinterpret_cast<EGLNativeWindowType>(info.info.wl.surface);
break;
#if defined(MIR_SUPPORT)
case SDL_SYSWM_MIR: {
native_display_ = static_cast<EGLNativeDisplayType>(mir_connection_get_egl_native_display(info.info.mir.connection));