mirror of https://github.com/encounter/SDL.git
Revert MIR_CFLAGS to SDL_CFLAGS. Use forward declaration for the real fix. (We shouldn't expose mir headers!)
This commit is contained in:
parent
beff5cece6
commit
ae2a50fc8f
|
@ -1299,7 +1299,6 @@ AC_HELP_STRING([--enable-mir-shared], [dynamically load Mir support [[default=ma
|
|||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MIR_LIBS"
|
||||
SUMMARY_video="${SUMMARY_video} mir"
|
||||
fi
|
||||
SDL_CFLAGS="$SDL_CFLAGS $MIR_CFLAGS"
|
||||
have_video=yes
|
||||
fi
|
||||
fi
|
||||
|
|
|
@ -98,11 +98,6 @@ typedef struct _UIViewController UIViewController;
|
|||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(SDL_VIDEO_DRIVER_MIR)
|
||||
#include <mir_toolkit/mir_client_library.h>
|
||||
#endif
|
||||
|
||||
|
||||
/**
|
||||
* These are the various supported windowing subsystems
|
||||
*/
|
||||
|
@ -225,8 +220,8 @@ struct SDL_SysWMinfo
|
|||
#if defined(SDL_VIDEO_DRIVER_MIR)
|
||||
struct
|
||||
{
|
||||
MirConnection *connection; /**< Mir display server connection */
|
||||
MirSurface *surface; /**< Mir surface */
|
||||
struct MirConnection *connection; /**< Mir display server connection */
|
||||
struct MirSurface *surface; /**< Mir surface */
|
||||
} mir;
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue