From 55b03c7493a7abed33cf803d1380a40fa8af903f Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 1 Nov 2022 05:47:12 -0700 Subject: [PATCH] Updated to version 2.24.2 for point release --- CMakeLists.txt | 2 +- Makefile.os2 | 2 +- Makefile.w32 | 2 +- Xcode/SDL/Info-Framework.plist | 4 ++-- Xcode/SDL/SDL.xcodeproj/project.pbxproj | 4 ++-- configure | 2 +- configure.ac | 2 +- include/SDL_version.h | 2 +- src/main/windows/version.rc | 8 ++++---- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 157261190..79e53b7d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,7 +82,7 @@ endif() # See docs/release_checklist.md set(SDL_MAJOR_VERSION 2) set(SDL_MINOR_VERSION 24) -set(SDL_MICRO_VERSION 1) +set(SDL_MICRO_VERSION 2) set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}") # Set defaults preventing destination file conflicts diff --git a/Makefile.os2 b/Makefile.os2 index 22bd9f4ca..ed8162448 100644 --- a/Makefile.os2 +++ b/Makefile.os2 @@ -13,7 +13,7 @@ LIBNAME = SDL2 MAJOR_VERSION = 2 MINOR_VERSION = 24 -MICRO_VERSION = 1 +MICRO_VERSION = 2 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION) DESCRIPTION = Simple DirectMedia Layer 2 diff --git a/Makefile.w32 b/Makefile.w32 index d7fcbcfb1..e415ee7d4 100644 --- a/Makefile.w32 +++ b/Makefile.w32 @@ -4,7 +4,7 @@ LIBNAME = SDL2 MAJOR_VERSION = 2 MINOR_VERSION = 24 -MICRO_VERSION = 1 +MICRO_VERSION = 2 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION) LIBHOME = . diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist index 4c3a0c0f2..bbd9f4d35 100644 --- a/Xcode/SDL/Info-Framework.plist +++ b/Xcode/SDL/Info-Framework.plist @@ -19,10 +19,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.24.1 + 2.24.2 CFBundleSignature SDLX CFBundleVersion - 2.24.1 + 2.24.2 diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj index 73b3425ba..8d98e78ac 100644 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj @@ -9397,7 +9397,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEPLOYMENT_POSTPROCESSING = YES; DYLIB_COMPATIBILITY_VERSION = 2401.0.0; - DYLIB_CURRENT_VERSION = 2401.1.0; + DYLIB_CURRENT_VERSION = 2401.2.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_ALTIVEC_EXTENSIONS = YES; @@ -9482,7 +9482,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 2401.0.0; - DYLIB_CURRENT_VERSION = 2401.1.0; + DYLIB_CURRENT_VERSION = 2401.2.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; diff --git a/configure b/configure index aa7283a01..a3fb4ea56 100755 --- a/configure +++ b/configure @@ -3438,7 +3438,7 @@ orig_CFLAGS="$CFLAGS" # See docs/release_checklist.md SDL_MAJOR_VERSION=2 SDL_MINOR_VERSION=24 -SDL_MICRO_VERSION=1 +SDL_MICRO_VERSION=2 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION SDL_BINARY_AGE=`expr $SDL_MINOR_VERSION \* 100 + $SDL_MICRO_VERSION` diff --git a/configure.ac b/configure.ac index 0ee6bcbd6..9ac8dac59 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ dnl Set various version strings - taken gratefully from the GTk sources # See docs/release_checklist.md SDL_MAJOR_VERSION=2 SDL_MINOR_VERSION=24 -SDL_MICRO_VERSION=1 +SDL_MICRO_VERSION=2 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION SDL_BINARY_AGE=`expr $SDL_MINOR_VERSION \* 100 + $SDL_MICRO_VERSION` diff --git a/include/SDL_version.h b/include/SDL_version.h index 9dfaf79c3..95d47bb21 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 24 -#define SDL_PATCHLEVEL 1 +#define SDL_PATCHLEVEL 2 /** * Macro to determine SDL version program was compiled against. diff --git a/src/main/windows/version.rc b/src/main/windows/version.rc index b48affb3d..cf7a68628 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,24,1,0 - PRODUCTVERSION 2,24,1,0 + FILEVERSION 2,24,2,0 + PRODUCTVERSION 2,24,2,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL\0" - VALUE "FileVersion", "2, 24, 1, 0\0" + VALUE "FileVersion", "2, 24, 2, 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, 24, 1, 0\0" + VALUE "ProductVersion", "2, 24, 2, 0\0" END END BLOCK "VarFileInfo"