From a0e3c884d4519d4ae02f5c22c7557759eaea60ca Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 17 Jan 2022 15:32:27 -0800 Subject: [PATCH] Updated to version 2.0.21 for development --- 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 a6a8a0029..b20c805bf 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 20) -set(SDL_INTERFACE_AGE 2) -set(SDL_BINARY_AGE 20) +set(SDL_MICRO_VERSION 21) +set(SDL_INTERFACE_AGE 3) +set(SDL_BINARY_AGE 21) 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.2.0) +set(DYLIB_CURRENT_VERSION 19.3.0) set(DYLIB_COMPATIBILITY_VERSION 1.0.0) # Set defaults preventing destination file conflicts diff --git a/Makefile.os2 b/Makefile.os2 index 6af282d52..5ae8616a9 100644 --- a/Makefile.os2 +++ b/Makefile.os2 @@ -11,7 +11,7 @@ # wmake -f Makefile.os2 HIDAPI=1 LIBNAME = SDL2 -VERSION = 2.0.20 +VERSION = 2.0.21 DESCRIPTION = Simple DirectMedia Layer 2 LIBICONV=0 diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist index 5f9ace084..19049bd46 100644 --- a/Xcode/SDL/Info-Framework.plist +++ b/Xcode/SDL/Info-Framework.plist @@ -19,10 +19,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.20 + 2.0.21 CFBundleSignature SDLX CFBundleVersion - 2.0.20 + 2.0.21 diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj index b23a394b9..cd8affb60 100644 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj @@ -9111,7 +9111,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEPLOYMENT_POSTPROCESSING = YES; DYLIB_COMPATIBILITY_VERSION = 1.0.0; - DYLIB_CURRENT_VERSION = 19.2.0; + DYLIB_CURRENT_VERSION = 19.3.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_ALTIVEC_EXTENSIONS = YES; @@ -9195,7 +9195,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 1.0.0; - DYLIB_CURRENT_VERSION = 19.2.0; + DYLIB_CURRENT_VERSION = 19.3.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 d03cccaf1..cd74a8885 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.20" +$SDLVersion = "2.0.21" # 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 e2843cb3b..dcb9adad1 100755 --- a/configure +++ b/configure @@ -2855,9 +2855,9 @@ orig_CFLAGS="$CFLAGS" # SDL_MAJOR_VERSION=2 SDL_MINOR_VERSION=0 -SDL_MICRO_VERSION=20 -SDL_INTERFACE_AGE=2 -SDL_BINARY_AGE=20 +SDL_MICRO_VERSION=21 +SDL_INTERFACE_AGE=3 +SDL_BINARY_AGE=21 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION diff --git a/configure.ac b/configure.ac index 5728ed34d..15033798e 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=20 -SDL_INTERFACE_AGE=2 -SDL_BINARY_AGE=20 +SDL_MICRO_VERSION=21 +SDL_INTERFACE_AGE=3 +SDL_BINARY_AGE=21 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 2716eba7b..a925dc432 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 20 +#define SDL_PATCHLEVEL 21 /** * Macro to determine SDL version program was compiled against. diff --git a/src/main/windows/version.rc b/src/main/windows/version.rc index bedde9b19..3080b9c56 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,20,0 - PRODUCTVERSION 2,0,20,0 + FILEVERSION 2,0,21,0 + PRODUCTVERSION 2,0,21,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL\0" - VALUE "FileVersion", "2, 0, 20, 0\0" + VALUE "FileVersion", "2, 0, 21, 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, 20, 0\0" + VALUE "ProductVersion", "2, 0, 21, 0\0" END END BLOCK "VarFileInfo"