mirror of
https://github.com/Ryujinx/SDL.git
synced 2024-12-23 04:55:34 +00:00
Updated SDL to version 2.0.15 for development
This commit is contained in:
Sam Lantinga
parent
13244de5c2
commit
350f1b0d16
|
|
@ -53,9 +53,9 @@ include(${SDL2_SOURCE_DIR}/cmake/sdlchecks.cmake)
|
|||
# set SDL_BINARY_AGE and SDL_INTERFACE_AGE to 0.
|
||||
set(SDL_MAJOR_VERSION 2)
|
||||
set(SDL_MINOR_VERSION 0)
|
||||
set(SDL_MICRO_VERSION 14)
|
||||
set(SDL_INTERFACE_AGE 0)
|
||||
set(SDL_BINARY_AGE 14)
|
||||
set(SDL_MICRO_VERSION 15)
|
||||
set(SDL_INTERFACE_AGE 1)
|
||||
set(SDL_BINARY_AGE 15)
|
||||
set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}")
|
||||
# the following should match the versions in Xcode project file:
|
||||
set(DYLIB_CURRENT_VERSION 15.0.0)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# wmake -f Makefile.os2
|
||||
|
||||
LIBNAME = SDL2
|
||||
VERSION = 2.0.14
|
||||
VERSION = 2.0.15
|
||||
DESCRIPTION = Simple DirectMedia Layer 2
|
||||
|
||||
LIBHOME = .
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@
|
|||
<key>CFBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>2.0.14</string>
|
||||
<string>2.0.15</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>SDLX</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>2.0.14</string>
|
||||
<string>2.0.15</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
|
|||
|
|
@ -10014,7 +10014,7 @@
|
|||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
DEPLOYMENT_POSTPROCESSING = YES;
|
||||
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
|
||||
DYLIB_CURRENT_VERSION = 15.0.0;
|
||||
DYLIB_CURRENT_VERSION = 15.1.0;
|
||||
DYLIB_INSTALL_NAME_BASE = "@rpath";
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
GCC_ALTIVEC_EXTENSIONS = YES;
|
||||
|
|
@ -10093,7 +10093,7 @@
|
|||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
DEBUG_INFORMATION_FORMAT = dwarf;
|
||||
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
|
||||
DYLIB_CURRENT_VERSION = 15.0.0;
|
||||
DYLIB_CURRENT_VERSION = 15.1.0;
|
||||
DYLIB_INSTALL_NAME_BASE = "@rpath";
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
ENABLE_TESTABILITY = YES;
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
#
|
||||
|
||||
# Base version of SDL, used for packaging purposes
|
||||
$SDLVersion = "2.0.14"
|
||||
$SDLVersion = "2.0.15"
|
||||
|
||||
# Gets the .bat file that sets up an MSBuild environment, given one of
|
||||
# Visual Studio's, "PlatformToolset"s.
|
||||
|
|
|
|||
50
configure
vendored
50
configure
vendored
|
|
@ -2817,9 +2817,9 @@ orig_CFLAGS="$CFLAGS"
|
|||
#
|
||||
SDL_MAJOR_VERSION=2
|
||||
SDL_MINOR_VERSION=0
|
||||
SDL_MICRO_VERSION=14
|
||||
SDL_INTERFACE_AGE=0
|
||||
SDL_BINARY_AGE=14
|
||||
SDL_MICRO_VERSION=15
|
||||
SDL_INTERFACE_AGE=1
|
||||
SDL_BINARY_AGE=15
|
||||
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
|
||||
|
||||
|
||||
|
|
@ -20123,34 +20123,8 @@ else
|
|||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
# One or both of the vars are not set, and there is no cached value.
|
||||
ac_x_includes=no
|
||||
ac_x_libraries=no
|
||||
# Do we need to do anything special at all?
|
||||
ac_save_LIBS=$LIBS
|
||||
LIBS="-lX11 $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <X11/Xlib.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
XrmInitialize ()
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
# We can compile and link X programs with no special options.
|
||||
ac_x_includes=
|
||||
ac_x_libraries=
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS="$ac_save_LIBS"
|
||||
# If that didn't work, only try xmkmf and filesystem searches
|
||||
# for native compilation.
|
||||
if test x"$ac_x_includes" = xno && test "$cross_compiling" = no; then :
|
||||
rm -f -r conftest.dir
|
||||
ac_x_includes=no ac_x_libraries=no
|
||||
rm -f -r conftest.dir
|
||||
if mkdir conftest.dir; then
|
||||
cd conftest.dir
|
||||
cat >Imakefile <<'_ACEOF'
|
||||
|
|
@ -20189,7 +20163,7 @@ _ACEOF
|
|||
rm -f -r conftest.dir
|
||||
fi
|
||||
|
||||
# Standard set of common directories for X headers.
|
||||
# Standard set of common directories for X headers.
|
||||
# Check X11 before X11Rn because it is often a symlink to the current release.
|
||||
ac_x_header_dirs='
|
||||
/usr/X11/include
|
||||
|
|
@ -20216,8 +20190,6 @@ ac_x_header_dirs='
|
|||
/usr/local/include/X11R5
|
||||
/usr/local/include/X11R4
|
||||
|
||||
/opt/X11/include
|
||||
|
||||
/usr/X386/include
|
||||
/usr/x386/include
|
||||
/usr/XFree86/include/X11
|
||||
|
|
@ -20291,17 +20263,15 @@ rm -f core conftest.err conftest.$ac_objext \
|
|||
conftest$ac_exeext conftest.$ac_ext
|
||||
fi # $ac_x_libraries = no
|
||||
|
||||
fi
|
||||
# Record the results.
|
||||
case $ac_x_includes,$ac_x_libraries in #(
|
||||
no,* | *,no | *\'*) :
|
||||
no,* | *,no | *\'*)
|
||||
# Didn't find X, or a directory has "'" in its name.
|
||||
ac_cv_have_x="have_x=no" ;; #(
|
||||
*) :
|
||||
ac_cv_have_x="have_x=no";; #(
|
||||
*)
|
||||
# Record where we found X for the cache.
|
||||
ac_cv_have_x="have_x=yes\
|
||||
ac_x_includes='$ac_x_includes'\
|
||||
ac_x_libraries='$ac_x_libraries'" ;;
|
||||
ac_x_libraries='$ac_x_libraries'"
|
||||
esac
|
||||
fi
|
||||
;; #(
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@ dnl Set various version strings - taken gratefully from the GTk sources
|
|||
#
|
||||
SDL_MAJOR_VERSION=2
|
||||
SDL_MINOR_VERSION=0
|
||||
SDL_MICRO_VERSION=14
|
||||
SDL_INTERFACE_AGE=0
|
||||
SDL_BINARY_AGE=14
|
||||
SDL_MICRO_VERSION=15
|
||||
SDL_INTERFACE_AGE=1
|
||||
SDL_BINARY_AGE=15
|
||||
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
|
||||
|
||||
AC_SUBST(SDL_MAJOR_VERSION)
|
||||
|
|
|
|||
6
debian/changelog
vendored
6
debian/changelog
vendored
|
|
@ -1,3 +1,9 @@
|
|||
libsdl2 (2.0.15) UNRELEASED; urgency=low
|
||||
|
||||
* Updated SDL to version 2.0.15 for development builds
|
||||
|
||||
-- Sam Lantinga <slouken@libsdl.org> Tue, 22 Dec 2020 10:29:01 -0800
|
||||
|
||||
libsdl2 (2.0.14) UNRELEASED; urgency=low
|
||||
|
||||
* Updated SDL to version 2.0.14
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ typedef struct SDL_version
|
|||
*/
|
||||
#define SDL_MAJOR_VERSION 2
|
||||
#define SDL_MINOR_VERSION 0
|
||||
#define SDL_PATCHLEVEL 14
|
||||
#define SDL_PATCHLEVEL 15
|
||||
|
||||
/**
|
||||
* \brief Macro to determine SDL version program was compiled against.
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
|||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 2,0,14,0
|
||||
PRODUCTVERSION 2,0,14,0
|
||||
FILEVERSION 2,0,15,0
|
||||
PRODUCTVERSION 2,0,15,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
FILEFLAGS 0x0L
|
||||
FILEOS 0x40004L
|
||||
|
|
@ -23,12 +23,12 @@ BEGIN
|
|||
BEGIN
|
||||
VALUE "CompanyName", "\0"
|
||||
VALUE "FileDescription", "SDL\0"
|
||||
VALUE "FileVersion", "2, 0, 14, 0\0"
|
||||
VALUE "FileVersion", "2, 0, 15, 0\0"
|
||||
VALUE "InternalName", "SDL\0"
|
||||
VALUE "LegalCopyright", "Copyright © 2020 Sam Lantinga\0"
|
||||
VALUE "OriginalFilename", "SDL2.dll\0"
|
||||
VALUE "ProductName", "Simple DirectMedia Layer\0"
|
||||
VALUE "ProductVersion", "2, 0, 14, 0\0"
|
||||
VALUE "ProductVersion", "2, 0, 15, 0\0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
|
|
|||
44
test/configure
vendored
44
test/configure
vendored
|
|
@ -3603,34 +3603,8 @@ else
|
|||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
# One or both of the vars are not set, and there is no cached value.
|
||||
ac_x_includes=no
|
||||
ac_x_libraries=no
|
||||
# Do we need to do anything special at all?
|
||||
ac_save_LIBS=$LIBS
|
||||
LIBS="-lX11 $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <X11/Xlib.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
XrmInitialize ()
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
# We can compile and link X programs with no special options.
|
||||
ac_x_includes=
|
||||
ac_x_libraries=
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS="$ac_save_LIBS"
|
||||
# If that didn't work, only try xmkmf and filesystem searches
|
||||
# for native compilation.
|
||||
if test x"$ac_x_includes" = xno && test "$cross_compiling" = no; then :
|
||||
rm -f -r conftest.dir
|
||||
ac_x_includes=no ac_x_libraries=no
|
||||
rm -f -r conftest.dir
|
||||
if mkdir conftest.dir; then
|
||||
cd conftest.dir
|
||||
cat >Imakefile <<'_ACEOF'
|
||||
|
|
@ -3669,7 +3643,7 @@ _ACEOF
|
|||
rm -f -r conftest.dir
|
||||
fi
|
||||
|
||||
# Standard set of common directories for X headers.
|
||||
# Standard set of common directories for X headers.
|
||||
# Check X11 before X11Rn because it is often a symlink to the current release.
|
||||
ac_x_header_dirs='
|
||||
/usr/X11/include
|
||||
|
|
@ -3696,8 +3670,6 @@ ac_x_header_dirs='
|
|||
/usr/local/include/X11R5
|
||||
/usr/local/include/X11R4
|
||||
|
||||
/opt/X11/include
|
||||
|
||||
/usr/X386/include
|
||||
/usr/x386/include
|
||||
/usr/XFree86/include/X11
|
||||
|
|
@ -3771,17 +3743,15 @@ rm -f core conftest.err conftest.$ac_objext \
|
|||
conftest$ac_exeext conftest.$ac_ext
|
||||
fi # $ac_x_libraries = no
|
||||
|
||||
fi
|
||||
# Record the results.
|
||||
case $ac_x_includes,$ac_x_libraries in #(
|
||||
no,* | *,no | *\'*) :
|
||||
no,* | *,no | *\'*)
|
||||
# Didn't find X, or a directory has "'" in its name.
|
||||
ac_cv_have_x="have_x=no" ;; #(
|
||||
*) :
|
||||
ac_cv_have_x="have_x=no";; #(
|
||||
*)
|
||||
# Record where we found X for the cache.
|
||||
ac_cv_have_x="have_x=yes\
|
||||
ac_x_includes='$ac_x_includes'\
|
||||
ac_x_libraries='$ac_x_libraries'" ;;
|
||||
ac_x_libraries='$ac_x_libraries'"
|
||||
esac
|
||||
fi
|
||||
;; #(
|
||||
|
|
|
|||
Loading…
Reference in a new issue