Skip to content

Commit

Permalink
Updated SDL to version 2.0.13 for development builds
Browse files Browse the repository at this point in the history
  • Loading branch information
slouken committed Mar 11, 2020
1 parent 5e61049 commit ea304ea
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 19 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,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 12)
set(SDL_INTERFACE_AGE 0)
set(SDL_BINARY_AGE 12)
set(SDL_MICRO_VERSION 13)
set(SDL_INTERFACE_AGE 1)
set(SDL_BINARY_AGE 13)
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 12.0.0)
Expand Down
2 changes: 1 addition & 1 deletion Makefile.os2
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# wmake -f Makefile.os2

LIBNAME = SDL2
VERSION = 2.0.12
VERSION = 2.0.13
DESCRIPTION = Simple DirectMedia Layer 2

LIBHOME = .
Expand Down
4 changes: 2 additions & 2 deletions Xcode/SDL/Info-Framework.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.0.12</string>
<string>2.0.13</string>
<key>CFBundleSignature</key>
<string>SDLX</string>
<key>CFBundleVersion</key>
<string>2.0.12</string>
<string>2.0.13</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion build-scripts/winrtbuild.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#

# Base version of SDL, used for packaging purposes
$SDLVersion = "2.0.12"
$SDLVersion = "2.0.13"

# Gets the .bat file that sets up an MSBuild environment, given one of
# Visual Studio's, "PlatformToolset"s.
Expand Down
6 changes: 3 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -2817,9 +2817,9 @@ orig_CFLAGS="$CFLAGS"
#
SDL_MAJOR_VERSION=2
SDL_MINOR_VERSION=0
SDL_MICRO_VERSION=12
SDL_INTERFACE_AGE=0
SDL_BINARY_AGE=12
SDL_MICRO_VERSION=13
SDL_INTERFACE_AGE=1
SDL_BINARY_AGE=13
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION


Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ dnl Set various version strings - taken gratefully from the GTk sources
#
SDL_MAJOR_VERSION=2
SDL_MINOR_VERSION=0
SDL_MICRO_VERSION=12
SDL_INTERFACE_AGE=0
SDL_BINARY_AGE=12
SDL_MICRO_VERSION=13
SDL_INTERFACE_AGE=1
SDL_BINARY_AGE=13
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION

AC_SUBST(SDL_MAJOR_VERSION)
Expand Down
8 changes: 7 additions & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
libsdl2 (2.0.12) UNRELEASED; urgency=low

* Updated SDL to version 2.0.12 for development builds
* Updated SDL to version 2.0.13 for development builds

-- Sam Lantinga <[email protected]> Tue, 10 Mar 2020 18:24:22 -0800

libsdl2 (2.0.12) UNRELEASED; urgency=low

* Updated SDL to version 2.0.12

-- Sam Lantinga <[email protected]> Sun, 1 Mar 2020 14:57:07 -0800

Expand Down
2 changes: 1 addition & 1 deletion include/SDL_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ typedef struct SDL_version
*/
#define SDL_MAJOR_VERSION 2
#define SDL_MINOR_VERSION 0
#define SDL_PATCHLEVEL 12
#define SDL_PATCHLEVEL 13

/**
* \brief Macro to determine SDL version program was compiled against.
Expand Down
8 changes: 4 additions & 4 deletions src/main/windows/version.rc
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,0,12,0
PRODUCTVERSION 2,0,12,0
FILEVERSION 2,0,13,0
PRODUCTVERSION 2,0,13,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x40004L
Expand All @@ -23,12 +23,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL\0"
VALUE "FileVersion", "2, 0, 12, 0\0"
VALUE "FileVersion", "2, 0, 13, 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, 12, 0\0"
VALUE "ProductVersion", "2, 0, 13, 0\0"
END
END
BLOCK "VarFileInfo"
Expand Down

0 comments on commit ea304ea

Please sign in to comment.