From 505d6a4a052592b2676f87456c1f564daa8d2c50 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 8 Apr 2022 18:18:56 -0700 Subject: [PATCH] Update version to 2.0.22 for release --- CMakeLists.txt | 8 ++++---- Makefile.os2 | 2 +- Xcode/SDL/Info-Framework.plist | 4 ++-- Xcode/SDL/SDL.xcodeproj/project.pbxproj | 4 ++-- build-scripts/winrtbuild.ps1 | 2 +- configure | 6 +++--- configure.ac | 6 +++--- include/SDL_version.h | 2 +- src/main/windows/version.rc | 8 ++++---- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b0dce6b8b..eb668bc47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,12 +66,12 @@ 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 21) -set(SDL_INTERFACE_AGE 3) -set(SDL_BINARY_AGE 21) +set(SDL_MICRO_VERSION 22) +set(SDL_INTERFACE_AGE 0) +set(SDL_BINARY_AGE 22) 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 19.3.0) +set(DYLIB_CURRENT_VERSION 23.0.0) set(DYLIB_COMPATIBILITY_VERSION 1.0.0) # Set defaults preventing destination file conflicts diff --git a/Makefile.os2 b/Makefile.os2 index 073ae5bc2..cfd0d6562 100644 --- a/Makefile.os2 +++ b/Makefile.os2 @@ -11,7 +11,7 @@ # wmake -f Makefile.os2 HIDAPI=1 LIBNAME = SDL2 -VERSION = 2.0.21 +VERSION = 2.0.22 DESCRIPTION = Simple DirectMedia Layer 2 LIBICONV=0 diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist index 19049bd46..49a711322 100644 --- a/Xcode/SDL/Info-Framework.plist +++ b/Xcode/SDL/Info-Framework.plist @@ -19,10 +19,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.21 + 2.0.22 CFBundleSignature SDLX CFBundleVersion - 2.0.21 + 2.0.22 diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj index 6fb0f40d6..8858cfdd9 100644 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj @@ -9151,7 +9151,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEPLOYMENT_POSTPROCESSING = YES; DYLIB_COMPATIBILITY_VERSION = 1.0.0; - DYLIB_CURRENT_VERSION = 19.3.0; + DYLIB_CURRENT_VERSION = 23.0.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_ALTIVEC_EXTENSIONS = YES; @@ -9235,7 +9235,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 1.0.0; - DYLIB_CURRENT_VERSION = 19.3.0; + DYLIB_CURRENT_VERSION = 23.0.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; diff --git a/build-scripts/winrtbuild.ps1 b/build-scripts/winrtbuild.ps1 index cd74a8885..736e6e006 100644 --- a/build-scripts/winrtbuild.ps1 +++ b/build-scripts/winrtbuild.ps1 @@ -39,7 +39,7 @@ # # Base version of SDL, used for packaging purposes -$SDLVersion = "2.0.21" +$SDLVersion = "2.0.22" # Gets the .bat file that sets up an MSBuild environment, given one of # Visual Studio's, "PlatformToolset"s. diff --git a/configure b/configure index 3bf0e00b6..f3ea813eb 100755 --- a/configure +++ b/configure @@ -2866,9 +2866,9 @@ orig_CFLAGS="$CFLAGS" # SDL_MAJOR_VERSION=2 SDL_MINOR_VERSION=0 -SDL_MICRO_VERSION=21 -SDL_INTERFACE_AGE=3 -SDL_BINARY_AGE=21 +SDL_MICRO_VERSION=22 +SDL_INTERFACE_AGE=0 +SDL_BINARY_AGE=22 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION diff --git a/configure.ac b/configure.ac index 117715cee..2209c04d7 100644 --- a/configure.ac +++ b/configure.ac @@ -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=21 -SDL_INTERFACE_AGE=3 -SDL_BINARY_AGE=21 +SDL_MICRO_VERSION=22 +SDL_INTERFACE_AGE=0 +SDL_BINARY_AGE=22 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION AC_SUBST(SDL_MAJOR_VERSION) diff --git a/include/SDL_version.h b/include/SDL_version.h index a925dc432..3df4e041a 100644 --- a/include/SDL_version.h +++ b/include/SDL_version.h @@ -59,7 +59,7 @@ typedef struct SDL_version */ #define SDL_MAJOR_VERSION 2 #define SDL_MINOR_VERSION 0 -#define SDL_PATCHLEVEL 21 +#define SDL_PATCHLEVEL 22 /** * Macro to determine SDL version program was compiled against. diff --git a/src/main/windows/version.rc b/src/main/windows/version.rc index 3080b9c56..f106c5f48 100644 --- a/src/main/windows/version.rc +++ b/src/main/windows/version.rc @@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,21,0 - PRODUCTVERSION 2,0,21,0 + FILEVERSION 2,0,22,0 + PRODUCTVERSION 2,0,22,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL\0" - VALUE "FileVersion", "2, 0, 21, 0\0" + VALUE "FileVersion", "2, 0, 22, 0\0" VALUE "InternalName", "SDL\0" VALUE "LegalCopyright", "Copyright (C) 2022 Sam Lantinga\0" VALUE "OriginalFilename", "SDL2.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "2, 0, 21, 0\0" + VALUE "ProductVersion", "2, 0, 22, 0\0" END END BLOCK "VarFileInfo"