Skip to content

Commit

Permalink
Updated to version 2.0.17 for development
Browse files Browse the repository at this point in the history
  • Loading branch information
slouken committed Aug 10, 2021
1 parent 6810399 commit 3f6ebff
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 20 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Expand Up @@ -51,9 +51,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 16)
set(SDL_INTERFACE_AGE 0)
set(SDL_BINARY_AGE 16)
set(SDL_MICRO_VERSION 17)
set(SDL_INTERFACE_AGE 1)
set(SDL_BINARY_AGE 17)
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 17.0.0)
Expand Down
2 changes: 1 addition & 1 deletion Makefile.os2
Expand Up @@ -2,7 +2,7 @@
# wmake -f Makefile.os2

LIBNAME = SDL2
VERSION = 2.0.16
VERSION = 2.0.17
DESCRIPTION = Simple DirectMedia Layer 2

LIBHOME = .
Expand Down
4 changes: 2 additions & 2 deletions Xcode/SDL/Info-Framework.plist
Expand Up @@ -19,10 +19,10 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.0.16</string>
<string>2.0.17</string>
<key>CFBundleSignature</key>
<string>SDLX</string>
<key>CFBundleVersion</key>
<string>2.0.16</string>
<string>2.0.17</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions Xcode/SDL/SDL.xcodeproj/project.pbxproj
Expand Up @@ -10161,7 +10161,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_LINK_OBJC_RUNTIME = NO;
MARKETING_VERSION = 2.0.16;
MARKETING_VERSION = 2.0.17;
OTHER_LDFLAGS = "-liconv";
};
name = Release;
Expand Down Expand Up @@ -10246,7 +10246,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_LINK_OBJC_RUNTIME = NO;
MARKETING_VERSION = 2.0.16;
MARKETING_VERSION = 2.0.17;
OTHER_LDFLAGS = "-liconv";
};
name = Debug;
Expand Down
2 changes: 1 addition & 1 deletion build-scripts/winrtbuild.ps1
Expand Up @@ -39,7 +39,7 @@
#

# Base version of SDL, used for packaging purposes
$SDLVersion = "2.0.16"
$SDLVersion = "2.0.17"

# 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
Expand Up @@ -2838,9 +2838,9 @@ orig_CFLAGS="$CFLAGS"
#
SDL_MAJOR_VERSION=2
SDL_MINOR_VERSION=0
SDL_MICRO_VERSION=16
SDL_INTERFACE_AGE=0
SDL_BINARY_AGE=16
SDL_MICRO_VERSION=17
SDL_INTERFACE_AGE=1
SDL_BINARY_AGE=17
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION


Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Expand Up @@ -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=16
SDL_INTERFACE_AGE=0
SDL_BINARY_AGE=16
SDL_MICRO_VERSION=17
SDL_INTERFACE_AGE=1
SDL_BINARY_AGE=17
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION

AC_SUBST(SDL_MAJOR_VERSION)
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
@@ -1,3 +1,9 @@
libsdl2 (2.0.17) UNRELEASED; urgency=low

* Updated SDL to version 2.0.17

-- Sam Lantinga <slouken@libsdl.org> Tue, 10 Aug 2021 15:00:14 -0800

libsdl2 (2.0.16) UNRELEASED; urgency=low

* Updated SDL to version 2.0.16
Expand Down
2 changes: 1 addition & 1 deletion include/SDL_version.h
Expand Up @@ -59,7 +59,7 @@ typedef struct SDL_version
*/
#define SDL_MAJOR_VERSION 2
#define SDL_MINOR_VERSION 0
#define SDL_PATCHLEVEL 16
#define SDL_PATCHLEVEL 17

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

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,0,16,0
PRODUCTVERSION 2,0,16,0
FILEVERSION 2,0,17,0
PRODUCTVERSION 2,0,17,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, 16, 0\0"
VALUE "FileVersion", "2, 0, 17, 0\0"
VALUE "InternalName", "SDL\0"
VALUE "LegalCopyright", "Copyright (C) 2021 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL2.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0"
VALUE "ProductVersion", "2, 0, 16, 0\0"
VALUE "ProductVersion", "2, 0, 17, 0\0"
END
END
BLOCK "VarFileInfo"
Expand Down

0 comments on commit 3f6ebff

Please sign in to comment.