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

Fixes building SDL on Ubuntu 16.04 with Mir headers installed

This commit is contained in:
Gabriel Jacobo 2016-09-01 16:01:54 -03:00
parent f11a440999
commit 1428bab3b3
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -18975,6 +18975,7 @@ main ()
{ {
MirPointerButton button = mir_pointer_button_primary; MirPointerButton button = mir_pointer_button_primary;
MirPointerConfinementState confined = mir_pointer_unconfined;
; ;
return 0; return 0;

3
configure.in
View File

@ -1291,11 +1291,12 @@ AC_HELP_STRING([--enable-video-mir], [use Mir video driver [[default=yes]]]),
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
CFLAGS="$save_CFLAGS $MIR_CFLAGS" CFLAGS="$save_CFLAGS $MIR_CFLAGS"
dnl This will disable Mir on Ubuntu < 15.04 (Mir should be 0.14 at this point) dnl This will disable Mir if >= v0.24 is not available
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#include <mir_toolkit/mir_client_library.h> #include <mir_toolkit/mir_client_library.h>
],[ ],[
MirPointerButton button = mir_pointer_button_primary; MirPointerButton button = mir_pointer_button_primary;
MirPointerConfinementState confined = mir_pointer_unconfined;
],[ ],[
video_mir=yes video_mir=yes
]) ])