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

Revert MIR_CFLAGS to SDL_CFLAGS. Use forward declaration for the real fix. (We shouldn't expose mir headers!)

This commit is contained in:
Brandon Schaefer 2014-04-21 12:42:25 -07:00
parent beff5cece6
commit ae2a50fc8f
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.in
View File

@ -1299,7 +1299,6 @@ AC_HELP_STRING([--enable-mir-shared], [dynamically load Mir support [[default=ma
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MIR_LIBS" EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MIR_LIBS"
SUMMARY_video="${SUMMARY_video} mir" SUMMARY_video="${SUMMARY_video} mir"
fi fi
SDL_CFLAGS="$SDL_CFLAGS $MIR_CFLAGS"
have_video=yes have_video=yes
fi fi
fi fi

9
include/SDL_syswm.h
View File

@ -98,11 +98,6 @@ typedef struct _UIViewController UIViewController;
#endif #endif
#endif #endif
#if defined(SDL_VIDEO_DRIVER_MIR)
#include <mir_toolkit/mir_client_library.h>
#endif
/** /**
* These are the various supported windowing subsystems * These are the various supported windowing subsystems
*/ */
@ -225,8 +220,8 @@ struct SDL_SysWMinfo
#if defined(SDL_VIDEO_DRIVER_MIR) #if defined(SDL_VIDEO_DRIVER_MIR)
struct struct
{ {
MirConnection *connection; /**< Mir display server connection */ struct MirConnection *connection; /**< Mir display server connection */
MirSurface *surface; /**< Mir surface */ struct MirSurface *surface; /**< Mir surface */
} mir; } mir;
#endif #endif