mirror of
https://github.com/love2d/megasource.git
synced 2026-08-19 04:05:09 +02:00
Updated SDL2 to the latest Mercurial revision.
This commit is contained in:
Alex Szpakowski
+29
-42
@@ -1159,28 +1159,6 @@ CheckWarnAll()
|
||||
fi
|
||||
}
|
||||
|
||||
dnl See if GCC's -Wshadow is supported.
|
||||
CheckWarnShadow()
|
||||
{
|
||||
AC_MSG_CHECKING(for GCC -Wshadow option)
|
||||
have_gcc_Wshadow=no
|
||||
|
||||
save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$save_CFLAGS -Wshadow"
|
||||
AC_TRY_COMPILE([
|
||||
int x = 0;
|
||||
],[
|
||||
],[
|
||||
have_gcc_Wshadow=yes
|
||||
])
|
||||
AC_MSG_RESULT($have_gcc_Wshadow)
|
||||
CFLAGS="$save_CFLAGS"
|
||||
|
||||
if test x$have_gcc_Wshadow = xyes; then
|
||||
EXTRA_CFLAGS="$EXTRA_CFLAGS -Wshadow"
|
||||
fi
|
||||
}
|
||||
|
||||
dnl Check for Wayland
|
||||
CheckWayland()
|
||||
{
|
||||
@@ -1492,18 +1470,6 @@ AC_HELP_STRING([--enable-x11-shared], [dynamically load X11 support [[default=ma
|
||||
])
|
||||
AC_MSG_RESULT($have_const_param_XextAddDisplay)
|
||||
|
||||
AC_MSG_CHECKING(for const parameter to _XData32)
|
||||
have_const_param_xdata32=no
|
||||
AC_TRY_COMPILE([
|
||||
#include <X11/Xlibint.h>
|
||||
extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
|
||||
],[
|
||||
],[
|
||||
have_const_param_xdata32=yes
|
||||
AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
|
||||
])
|
||||
AC_MSG_RESULT($have_const_param_xdata32)
|
||||
|
||||
dnl AC_CHECK_LIB(X11, XGetEventData, AC_DEFINE(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS, 1, [Have XGenericEvent]))
|
||||
AC_MSG_CHECKING([for XGenericEvent])
|
||||
have_XGenericEvent=no
|
||||
@@ -1552,6 +1518,20 @@ AC_HELP_STRING([--enable-video-x11-xcursor], [enable X11 Xcursor support [[defau
|
||||
AC_DEFINE(SDL_VIDEO_DRIVER_X11_XCURSOR, 1, [ ])
|
||||
SUMMARY_video_x11="${SUMMARY_video_x11} xcursor"
|
||||
fi
|
||||
AC_ARG_ENABLE(video-x11-xdbe,
|
||||
AC_HELP_STRING([--enable-video-x11-xdbe], [enable X11 Xdbe support [[default=yes]]]),
|
||||
, enable_video_x11_xdbe=yes)
|
||||
if test x$enable_video_x11_xdbe = xyes; then
|
||||
AC_CHECK_HEADER(X11/extensions/Xdbe.h,
|
||||
have_dbe_h_hdr=yes,
|
||||
have_dbe_h_hdr=no,
|
||||
[#include <X11/Xlib.h>
|
||||
])
|
||||
if test x$have_dbe_h_hdr = xyes; then
|
||||
AC_DEFINE(SDL_VIDEO_DRIVER_X11_XDBE, 1, [ ])
|
||||
SUMMARY_video_x11="${SUMMARY_video_x11} xdbe"
|
||||
fi
|
||||
fi
|
||||
AC_ARG_ENABLE(video-x11-xinerama,
|
||||
AC_HELP_STRING([--enable-video-x11-xinerama], [enable X11 Xinerama support [[default=yes]]]),
|
||||
, enable_video_x11_xinerama=yes)
|
||||
@@ -2413,7 +2393,6 @@ AC_HELP_STRING([--enable-pthread-sem], [use pthread semaphores [[default=yes]]])
|
||||
EXTRA_CFLAGS="$EXTRA_CFLAGS $pthread_cflags"
|
||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $pthread_lib"
|
||||
SDL_CFLAGS="$SDL_CFLAGS $pthread_cflags"
|
||||
SDL_LIBS="$SDL_LIBS $pthread_lib"
|
||||
|
||||
# Save the original compiler flags and libraries
|
||||
ac_save_cflags="$CFLAGS"; ac_save_libs="$LIBS"
|
||||
@@ -2424,7 +2403,8 @@ AC_HELP_STRING([--enable-pthread-sem], [use pthread semaphores [[default=yes]]])
|
||||
AC_MSG_CHECKING(for recursive mutexes)
|
||||
has_recursive_mutexes=no
|
||||
if test x$has_recursive_mutexes = xno; then
|
||||
AC_TRY_COMPILE([
|
||||
AC_TRY_LINK([
|
||||
#define _GNU_SOURCE 1
|
||||
#include <pthread.h>
|
||||
],[
|
||||
pthread_mutexattr_t attr;
|
||||
@@ -2435,7 +2415,8 @@ AC_HELP_STRING([--enable-pthread-sem], [use pthread semaphores [[default=yes]]])
|
||||
])
|
||||
fi
|
||||
if test x$has_recursive_mutexes = xno; then
|
||||
AC_TRY_COMPILE([
|
||||
AC_TRY_LINK([
|
||||
#define _GNU_SOURCE 1
|
||||
#include <pthread.h>
|
||||
],[
|
||||
pthread_mutexattr_t attr;
|
||||
@@ -2835,7 +2816,9 @@ case "$host" in
|
||||
|
||||
if test x$enable_video = xyes; then
|
||||
SOURCES="$SOURCES $srcdir/src/video/raspberry/*.c"
|
||||
# FIXME: confdefs? Not AC_DEFINE?
|
||||
$as_echo "#define SDL_VIDEO_DRIVER_RPI 1" >>confdefs.h
|
||||
SUMMARY_video="${SUMMARY_video} rpi"
|
||||
fi
|
||||
;;
|
||||
*-*-androideabi*)
|
||||
@@ -2849,6 +2832,7 @@ case "$host" in
|
||||
|
||||
if test x$enable_video = xyes; then
|
||||
SOURCES="$SOURCES $srcdir/src/core/android/*.c $srcdir/src/video/android/*.c"
|
||||
# FIXME: confdefs? Not AC_DEFINE?
|
||||
$as_echo "#define SDL_VIDEO_DRIVER_ANDROID 1" >>confdefs.h
|
||||
SUMMARY_video="${SUMMARY_video} android"
|
||||
fi
|
||||
@@ -2892,8 +2876,12 @@ case "$host" in
|
||||
CheckLibUDev
|
||||
CheckDBus
|
||||
CheckIBus
|
||||
CheckInputEvents
|
||||
CheckInputKD
|
||||
case $ARCH in
|
||||
linux)
|
||||
CheckInputEvents
|
||||
CheckInputKD
|
||||
;;
|
||||
esac
|
||||
CheckTslib
|
||||
CheckUSBHID
|
||||
CheckPTHREAD
|
||||
@@ -3113,7 +3101,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
|
||||
else
|
||||
LIBUUID=-luuid
|
||||
fi
|
||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion $LIBUUID -XCClinker -static-libgcc"
|
||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion $LIBUUID -static-libgcc"
|
||||
# The Windows platform requires special setup
|
||||
VERSION_SOURCES="$srcdir/src/main/windows/*.rc"
|
||||
SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"
|
||||
@@ -3405,7 +3393,6 @@ esac
|
||||
|
||||
dnl Do this on all platforms, after everything else.
|
||||
CheckWarnAll
|
||||
CheckWarnShadow
|
||||
|
||||
# Verify that we have all the platform specific files we need
|
||||
|
||||
@@ -3546,7 +3533,7 @@ $SDLTEST_DEPENDS
|
||||
__EOF__
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
Makefile:Makefile.in:Makefile.rules sdl2-config SDL2.spec sdl2.pc
|
||||
Makefile:Makefile.in:Makefile.rules sdl2-config sdl2-config.cmake SDL2.spec sdl2.pc
|
||||
])
|
||||
AC_CONFIG_COMMANDS([sdl2_config],[chmod a+x sdl2-config])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user