early-access version 2325
This commit is contained in:
pineappleEA
111
externals/SDL/configure.ac
vendored
111
externals/SDL/configure.ac
vendored
@@ -22,9 +22,9 @@ dnl Set various version strings - taken gratefully from the GTk sources
|
||||
#
|
||||
SDL_MAJOR_VERSION=2
|
||||
SDL_MINOR_VERSION=0
|
||||
SDL_MICRO_VERSION=18
|
||||
SDL_INTERFACE_AGE=0
|
||||
SDL_BINARY_AGE=18
|
||||
SDL_MICRO_VERSION=19
|
||||
SDL_INTERFACE_AGE=1
|
||||
SDL_BINARY_AGE=19
|
||||
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
|
||||
|
||||
AC_SUBST(SDL_MAJOR_VERSION)
|
||||
@@ -1973,12 +1973,16 @@ XITouchClassInfo *t;
|
||||
if test x$enable_video_x11_xfixes = xyes; then
|
||||
definitely_enable_video_x11_xfixes=no
|
||||
# check along with XInput2.h because we use Xfixes with XIBarrierReleasePointer
|
||||
AC_CHECK_HEADER(X11/extensions/Xfixes.h,
|
||||
have_xfixes_h_hdr=yes,
|
||||
have_xfixes_h_hdr=no,
|
||||
[#include <X11/Xlib.h>
|
||||
#include <X11/Xproto.h>
|
||||
#include <X11/extensions/XInput2.h>])
|
||||
AC_MSG_CHECKING(for X11/extensions/Xfixes.h)
|
||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xproto.h>
|
||||
#include <X11/extensions/XInput2.h>
|
||||
#include <X11/extensions/Xfixes.h>]],
|
||||
[BarrierEventID b;])],
|
||||
[have_xfixes_h_hdr=yes],
|
||||
[have_xfixes_h_hdr=no])
|
||||
AC_MSG_RESULT($have_xfixes_h_hdr)
|
||||
if test x$have_xfixes_h_hdr = xyes; then
|
||||
if test x$enable_x11_shared = xyes && test x$xfixes_lib != x ; then
|
||||
echo "-- dynamic libXfixes -> $xfixes_lib"
|
||||
@@ -3183,6 +3187,21 @@ CheckWINDOWS()
|
||||
CheckStackBoundary
|
||||
}
|
||||
|
||||
dnl Determine whether the compiler can produce OS/2 executables
|
||||
CheckOS2()
|
||||
{
|
||||
AC_MSG_CHECKING(OS/2 compiler)
|
||||
have_os2_gcc=no
|
||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <os2.h>]],
|
||||
[])],[have_os2_gcc=yes],[])
|
||||
AC_MSG_RESULT($have_os2_gcc)
|
||||
if test x$have_os2_gcc != xyes; then
|
||||
AC_MSG_ERROR([
|
||||
*** Your compiler ($CC) does not produce OS/2 executables!
|
||||
])
|
||||
fi
|
||||
}
|
||||
|
||||
dnl Find the DirectX includes and libraries
|
||||
CheckDIRECTX()
|
||||
{
|
||||
@@ -4381,6 +4400,80 @@ case "$host" in
|
||||
have_timers=yes
|
||||
fi
|
||||
;;
|
||||
*-*-os2*)
|
||||
ARCH=os2
|
||||
if test "$build" != "$host"; then # cross-compiling
|
||||
# Default cross-compile location
|
||||
ac_default_prefix=/@unixroot/usr/local/cross-tools/$host
|
||||
else
|
||||
# Look for the location of the tools and install there
|
||||
if test "$BUILD_PREFIX" != ""; then
|
||||
ac_default_prefix=$BUILD_PREFIX
|
||||
fi
|
||||
fi
|
||||
enable_static=no # disable static builds
|
||||
EXTRA_CFLAGS="$EXTRA_CFLAGS -DBUILD_SDL -DOS2EMX_PLAIN_CHAR"
|
||||
CheckOS2
|
||||
CheckDeclarationAfterStatement
|
||||
CheckDummyVideo
|
||||
CheckDiskAudio
|
||||
CheckDummyAudio
|
||||
|
||||
# Set up the core platform files
|
||||
SOURCES="$SOURCES $srcdir/src/core/os2/*.c"
|
||||
if test x$ac_cv_func_iconv != xyes -o x$ac_cv_header_iconv_h != xyes; then
|
||||
SOURCES="$SOURCES $srcdir/src/core/os2/geniconv/*.c"
|
||||
fi
|
||||
# Use the Unix locale APIs.
|
||||
SOURCES="$SOURCES $srcdir/src/locale/unix/*.c"
|
||||
have_locale=yes
|
||||
# Set up files for the video library
|
||||
if test x$enable_video = xyes; then
|
||||
AC_DEFINE(SDL_VIDEO_DRIVER_OS2, 1, [ ])
|
||||
SOURCES="$SOURCES $srcdir/src/video/os2/*.c"
|
||||
have_video=yes
|
||||
SUMMARY_video="${SUMMARY_video} os/2"
|
||||
fi
|
||||
# Set up files for the audio library
|
||||
if test x$enable_audio = xyes; then
|
||||
AC_DEFINE(SDL_AUDIO_DRIVER_OS2, 1, [ ])
|
||||
SOURCES="$SOURCES $srcdir/src/audio/os2/*.c"
|
||||
have_audio=yes
|
||||
SUMMARY_audio="${SUMMARY_audio} os/2"
|
||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmmpm2"
|
||||
fi
|
||||
# Set up files for the thread library
|
||||
if test x$enable_threads = xyes; then
|
||||
AC_DEFINE(SDL_THREAD_OS2, 1, [ ])
|
||||
SOURCES="$SOURCES $srcdir/src/thread/os2/*.c"
|
||||
SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
|
||||
have_threads=yes
|
||||
fi
|
||||
# Set up files for the timer library
|
||||
if test x$enable_timers = xyes; then
|
||||
AC_DEFINE(SDL_TIMER_OS2, 1, [ ])
|
||||
SOURCES="$SOURCES $srcdir/src/timer/os2/*.c"
|
||||
have_timers=yes
|
||||
fi
|
||||
# Set up files for the shared object loading library
|
||||
if test x$enable_loadso = xyes; then
|
||||
AC_DEFINE(SDL_LOADSO_OS2, 1, [ ])
|
||||
SOURCES="$SOURCES $srcdir/src/loadso/os2/*.c"
|
||||
have_loadso=yes
|
||||
fi
|
||||
# Set up files for the filesystem library
|
||||
if test x$enable_filesystem = xyes; then
|
||||
AC_DEFINE(SDL_FILESYSTEM_OS2, 1, [ ])
|
||||
SOURCES="$SOURCES $srcdir/src/filesystem/os2/*.c"
|
||||
have_filesystem=yes
|
||||
fi
|
||||
# Set up files for the joystick library
|
||||
if test x$enable_joystick = xyes; then
|
||||
AC_DEFINE(SDL_JOYSTICK_OS2, 1, [ ])
|
||||
SOURCES="$SOURCES $srcdir/src/joystick/os2/*.c"
|
||||
have_joystick=yes
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR([
|
||||
*** Unsupported host: Please add to configure.ac
|
||||
|
||||
Reference in New Issue
Block a user