encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mir: Disable Mir by default as Mir supports Wayland clients 

Also remove enabling VK support for Mir
This commit is contained in:
Brandon Schaefer 2018-02-23 11:24:26 -05:00
parent 8891f5919f
commit e17c3219d3
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.in
View File

@ -1468,8 +1468,8 @@ dnl Check for Mir
CheckMir() CheckMir()
{ {
AC_ARG_ENABLE(video-mir, AC_ARG_ENABLE(video-mir,
AC_HELP_STRING([--enable-video-mir], [use Mir video driver [[default=yes]]]), AC_HELP_STRING([--enable-video-mir], [use Mir video driver [[default=no]]]),
,enable_video_mir=yes) ,enable_video_mir=no)
if test x$enable_video = xyes -a x$enable_video_mir = xyes; then if test x$enable_video = xyes -a x$enable_video_mir = xyes; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no) AC_PATH_PROG(PKG_CONFIG, pkg-config, no)

3
src/video/SDL_vulkan_internal.h
View File

@ -38,9 +38,6 @@
#if SDL_VIDEO_DRIVER_COCOA #if SDL_VIDEO_DRIVER_COCOA
#define VK_USE_PLATFORM_MACOS_MVK #define VK_USE_PLATFORM_MACOS_MVK
#endif #endif
#if SDL_VIDEO_DRIVER_MIR
#define VK_USE_PLATFORM_MIR_KHR
#endif
#if SDL_VIDEO_DRIVER_UIKIT #if SDL_VIDEO_DRIVER_UIKIT
#define VK_USE_PLATFORM_IOS_MVK #define VK_USE_PLATFORM_IOS_MVK
#endif #endif