Commit ae2a50fc8fe45b2515bfcd7b84fe27e2a9dab247
2014-04-21T12:42:25
Revert MIR_CFLAGS to SDL_CFLAGS. Use forward declaration for the real fix. (We shouldn't expose mir headers!)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39
diff --git a/configure.in b/configure.in
index 8eccc37..ae3200c 100644
--- a/configure.in
+++ b/configure.in
@@ -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
diff --git a/include/SDL_syswm.h b/include/SDL_syswm.h
index a3fe738..59277ec 100644
--- a/include/SDL_syswm.h
+++ b/include/SDL_syswm.h
@@ -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