early-access version 1988
This commit is contained in:
132
externals/SDL/configure
vendored
132
externals/SDL/configure
vendored
@@ -690,6 +690,8 @@ ALSA_CFLAGS
|
||||
POW_LIB
|
||||
LIBOBJS
|
||||
ALLOCA
|
||||
LIBTOOLLINKERTAG
|
||||
LINKER
|
||||
PKG_CONFIG_LIBDIR
|
||||
PKG_CONFIG_PATH
|
||||
PKG_CONFIG
|
||||
@@ -861,6 +863,8 @@ enable_arm_neon
|
||||
enable_video_wayland
|
||||
enable_video_wayland_qt_touch
|
||||
enable_wayland_shared
|
||||
enable_libdecor
|
||||
enable_libdecor_shared
|
||||
enable_video_rpi
|
||||
enable_video_x11
|
||||
with_x
|
||||
@@ -1640,6 +1644,10 @@ Optional Features:
|
||||
QtWayland server support for Wayland video driver
|
||||
[default=yes]
|
||||
--enable-wayland-shared dynamically load Wayland support [default=maybe]
|
||||
--enable-libdecor use libdecor for Wayland client-side decorations
|
||||
[default=yes]
|
||||
--enable-libdecor-shared
|
||||
dynamically load libdecor [default=yes]
|
||||
--enable-video-rpi use Raspberry Pi video driver [default=yes]
|
||||
--enable-video-x11 use X11 video driver [default=yes]
|
||||
--enable-x11-shared dynamically load X11 support [default=maybe]
|
||||
@@ -2832,9 +2840,9 @@ orig_CFLAGS="$CFLAGS"
|
||||
#
|
||||
SDL_MAJOR_VERSION=2
|
||||
SDL_MINOR_VERSION=0
|
||||
SDL_MICRO_VERSION=15
|
||||
SDL_INTERFACE_AGE=1
|
||||
SDL_BINARY_AGE=15
|
||||
SDL_MICRO_VERSION=16
|
||||
SDL_INTERFACE_AGE=0
|
||||
SDL_BINARY_AGE=16
|
||||
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
|
||||
|
||||
|
||||
@@ -16010,6 +16018,19 @@ case "$host" in
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$host" in
|
||||
*-*-haiku*)
|
||||
LINKER='$(CXX)'
|
||||
LIBTOOLLINKERTAG='CXX'
|
||||
;;
|
||||
*)
|
||||
LINKER='$(CC)'
|
||||
LIBTOOLLINKERTAG='CC'
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
|
||||
if test x$srcdir != x.; then
|
||||
INCLUDE="-Iinclude $INCLUDE"
|
||||
elif test -d .git; then
|
||||
@@ -17826,14 +17847,27 @@ $as_echo "$have_gcc_sse3" >&6; }
|
||||
fi
|
||||
fi
|
||||
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "immintrin.h" "ac_cv_header_immintrin_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_immintrin_h" = xyes; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for immintrin.h" >&5
|
||||
$as_echo_n "checking for immintrin.h... " >&6; }
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <immintrin.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
have_immintrin_h_hdr=yes
|
||||
else
|
||||
have_immintrin_h_hdr=no
|
||||
fi
|
||||
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_immintrin_h_hdr" >&5
|
||||
$as_echo "$have_immintrin_h_hdr" >&6; }
|
||||
if test x$have_immintrin_h_hdr = xyes; then
|
||||
|
||||
$as_echo "#define HAVE_IMMINTRIN_H 1" >>confdefs.h
|
||||
@@ -19901,7 +19935,7 @@ else
|
||||
fi
|
||||
|
||||
|
||||
case "$host" in
|
||||
case "$host" in
|
||||
*)
|
||||
wayland_client_lib=`find_lib "libwayland-client.so.*" "$WAYLAND_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`
|
||||
wayland_egl_lib=`find_lib "libwayland-egl.so.*" "$WAYLAND_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`
|
||||
@@ -19959,6 +19993,63 @@ _ACEOF
|
||||
SUMMARY_video="${SUMMARY_video} wayland"
|
||||
fi
|
||||
have_video=yes
|
||||
|
||||
# Check whether --enable-libdecor was given.
|
||||
if test "${enable_libdecor+set}" = set; then :
|
||||
enableval=$enable_libdecor;
|
||||
else
|
||||
enable_libdecor=yes
|
||||
fi
|
||||
|
||||
if test x$enable_libdecor = xyes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libdecor support" >&5
|
||||
$as_echo_n "checking for libdecor support... " >&6; }
|
||||
if $PKG_CONFIG --exists libdecor-0; then :
|
||||
video_libdecor=yes
|
||||
else
|
||||
video_libdecor=no
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_libdecor" >&5
|
||||
$as_echo "$video_libdecor" >&6; }
|
||||
if test x$video_libdecor = xyes; then
|
||||
EXTRA_CFLAGS="$EXTRA_CFLAGS `$PKG_CONFIG --cflags libdecor-0`"
|
||||
|
||||
$as_echo "#define HAVE_LIBDECOR_H 1" >>confdefs.h
|
||||
|
||||
|
||||
# Check whether --enable-libdecor-shared was given.
|
||||
if test "${enable_libdecor_shared+set}" = set; then :
|
||||
enableval=$enable_libdecor_shared;
|
||||
else
|
||||
enable_libdecor_shared=yes
|
||||
fi
|
||||
|
||||
|
||||
if test x$enable_wayland_shared != xyes; then
|
||||
enable_libdecor_shared=no
|
||||
fi
|
||||
|
||||
decor_lib=`find_lib "libdecor-0.so.*" "" | sed 's/.*\/\(.*\)/\1/; q'`
|
||||
|
||||
if test x$have_loadso != xyes && \
|
||||
test x$enable_libdecor_shared = xyes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You must have SDL_LoadObject() support for dynamic libdecor loading" >&5
|
||||
$as_echo "$as_me: WARNING: You must have SDL_LoadObject() support for dynamic libdecor loading" >&2;}
|
||||
fi
|
||||
|
||||
if test x$have_loadso = xyes && \
|
||||
test x$enable_libdecor_shared = xyes && test x$decor_lib != x; then
|
||||
echo "-- dynamic libdecor -> $decor_lib"
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_LIBDECOR "$decor_lib"
|
||||
_ACEOF
|
||||
|
||||
else
|
||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS `$PKG_CONFIG --libs libdecor-0`"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@@ -22227,8 +22318,8 @@ $as_echo "#define SDL_VIDEO_DRIVER_KMSDRM 1" >>confdefs.h
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kmsdrm dynamic loading support" >&5
|
||||
$as_echo_n "checking for kmsdrm dynamic loading support... " >&6; }
|
||||
kmsdrm_shared=no
|
||||
drm_lib=`find_lib "libdrm.so.*" "$DRM_LIBS"`
|
||||
gbm_lib=`find_lib "libgbm.so.*" "$DRM_LIBS"`
|
||||
drm_lib=`find_lib "libdrm.so.*" "$LIBDRM_LIBS"`
|
||||
gbm_lib=`find_lib "libgbm.so.*" "$LIBGBM_LIBS"`
|
||||
if test x$have_loadso != xyes && \
|
||||
test x$enable_kmsdrm_shared = xyes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You must have SDL_LoadObject() support for dynamic kmsdrm loading" >&5
|
||||
@@ -22259,6 +22350,10 @@ _ACEOF
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kmsdrm_shared" >&5
|
||||
$as_echo "$kmsdrm_shared" >&6; }
|
||||
if test x$kmsdrm_shared = xyes; then
|
||||
echo "-- dynamic libdrm -> $drm_lib"
|
||||
echo "-- dynamic libgmb -> $gbm_lib"
|
||||
fi
|
||||
have_video=yes
|
||||
fi
|
||||
fi
|
||||
@@ -24534,10 +24629,6 @@ fi
|
||||
enable_hidapi_libusb=yes
|
||||
require_hidapi_libusb=yes
|
||||
;;
|
||||
# RAWINPUT is only available on Win32, but can be enabled if HIDAPI is
|
||||
*-*-cygwin* | *-*-mingw*)
|
||||
enable_joystick_rawinput=yes
|
||||
;;
|
||||
esac
|
||||
|
||||
hidapi_support=yes
|
||||
@@ -24633,11 +24724,6 @@ fi
|
||||
|
||||
$as_echo "#define SDL_JOYSTICK_HIDAPI 1" >>confdefs.h
|
||||
|
||||
if test x$enable_joystick_rawinput = xyes; then
|
||||
|
||||
$as_echo "#define SDL_JOYSTICK_RAWINPUT 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
EXTRA_CFLAGS="$EXTRA_CFLAGS -I$srcdir/src/hidapi/hidapi"
|
||||
SOURCES="$SOURCES $srcdir/src/joystick/hidapi/*.c"
|
||||
SOURCES="$SOURCES $srcdir/src/hidapi/SDL_hidapi.c"
|
||||
@@ -25217,6 +25303,9 @@ $as_echo "#define SDL_AUDIO_DRIVER_WASAPI 1" >>confdefs.h
|
||||
fi
|
||||
# Set up files for the joystick library
|
||||
if test x$enable_joystick = xyes; then
|
||||
|
||||
$as_echo "#define SDL_JOYSTICK_RAWINPUT 1" >>confdefs.h
|
||||
|
||||
if test x$have_dinput = xyes -o x$have_xinput = xyes; then
|
||||
if test x$have_xinput = xyes; then
|
||||
|
||||
@@ -25324,7 +25413,8 @@ $as_echo "#define SDL_LOADSO_WINDOWS 1" >>confdefs.h
|
||||
else
|
||||
LIBUUID=-luuid
|
||||
fi
|
||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID -static-libgcc"
|
||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID"
|
||||
BUILD_LDFLAGS="$BUILD_LDFLAGS -Wc,-static-libgcc"
|
||||
# The Windows platform requires special setup
|
||||
VERSION_SOURCES="$srcdir/src/main/windows/*.rc"
|
||||
SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"
|
||||
@@ -25902,6 +25992,7 @@ if test x$video_wayland = xyes; then
|
||||
printf '%s\n' " \\$(RUN_CMD_GEN)\\$(WAYLAND_SCANNER) \\$(WAYLAND_SCANNER_CODE_MODE) \\$< \\$@" ;\
|
||||
echo ;\
|
||||
printf '%s\n' "\\$(objects)/\$p-protocol.lo: \\$(gen)/\$p-protocol.c \\$(gen)/\$p-client-protocol.h" ;\
|
||||
printf '%s\n' " @\\$(SHELL) \\$(auxdir)/mkinstalldirs \\$(objects)" ;\
|
||||
printf '%s\n' " \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@" ;\
|
||||
done ;\
|
||||
echo ;\
|
||||
@@ -26103,7 +26194,6 @@ if test x$WARN_ABOUT_ARM_SIMD_ASM_MIT = xyes; then
|
||||
SUMMARY="${SUMMARY}configure script with:\n"
|
||||
SUMMARY="${SUMMARY}\n --disable-arm-simd\n"
|
||||
fi
|
||||
|
||||
if test x$WARN_ABOUT_ARM_NEON_ASM_MIT = xyes; then
|
||||
SUMMARY="${SUMMARY}\nSDL is being built with ARM NEON optimizations, which\n"
|
||||
SUMMARY="${SUMMARY}uses code licensed under the MIT license. If this is a\n"
|
||||
|
Reference in New Issue
Block a user