From 6e9c14e550417057737831884e21fdd70d11e081 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 19 Aug 2022 09:38:42 -0700 Subject: [PATCH] Updated to version 2.25.0 for development --- CMakeLists.txt | 2 +- Makefile.os2 | 2 +- Makefile.w32 | 2 +- Xcode/SDL/Info-Framework.plist | 4 ++-- Xcode/SDL/SDL.xcodeproj/project.pbxproj | 4 ++-- configure.ac | 2 +- include/SDL_version.h | 2 +- src/main/windows/version.rc | 8 ++++---- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b5369937..aa36eb02c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,7 +80,7 @@ endif() # See docs/release_checklist.md set(SDL_MAJOR_VERSION 2) -set(SDL_MINOR_VERSION 24) +set(SDL_MINOR_VERSION 25) set(SDL_MICRO_VERSION 0) set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}") diff --git a/Makefile.os2 b/Makefile.os2 index 1170186c6..16881d12d 100644 --- a/Makefile.os2 +++ b/Makefile.os2 @@ -12,7 +12,7 @@ LIBNAME = SDL2 MAJOR_VERSION = 2 -MINOR_VERSION = 24 +MINOR_VERSION = 25 MICRO_VERSION = 0 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION) DESCRIPTION = Simple DirectMedia Layer 2 diff --git a/Makefile.w32 b/Makefile.w32 index e15e6bc92..faecf63bf 100644 --- a/Makefile.w32 +++ b/Makefile.w32 @@ -3,7 +3,7 @@ LIBNAME = SDL2 MAJOR_VERSION = 2 -MINOR_VERSION = 24 +MINOR_VERSION = 25 MICRO_VERSION = 0 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION) DESCRIPTION = Simple DirectMedia Layer 2 diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist index f6e390028..ada597b7d 100644 --- a/Xcode/SDL/Info-Framework.plist +++ b/Xcode/SDL/Info-Framework.plist @@ -19,10 +19,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.24.0 + 2.25.0 CFBundleSignature SDLX CFBundleVersion - 2.24.0 + 2.25.0 diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj index c2b6538fc..aed0af73a 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 = 1.0.0; - DYLIB_CURRENT_VERSION = 2401.0.0; + DYLIB_CURRENT_VERSION = 2501.0.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 = 1.0.0; - DYLIB_CURRENT_VERSION = 2401.0.0; + DYLIB_CURRENT_VERSION = 2501.0.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; diff --git a/configure.ac b/configure.ac index 71d51a0b0..55ba94972 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ orig_CFLAGS="$CFLAGS" 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_MINOR_VERSION=25 SDL_MICRO_VERSION=0 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION diff --git a/include/SDL_version.h b/include/SDL_version.h index fbe09db89..b817be1a2 100644 --- a/include/SDL_version.h +++ b/include/SDL_version.h @@ -58,7 +58,7 @@ typedef struct SDL_version /* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL */ #define SDL_MAJOR_VERSION 2 -#define SDL_MINOR_VERSION 24 +#define SDL_MINOR_VERSION 25 #define SDL_PATCHLEVEL 0 /** diff --git a/src/main/windows/version.rc b/src/main/windows/version.rc index bc7ad8c83..f13b89759 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,0,0 - PRODUCTVERSION 2,24,0,0 + FILEVERSION 2,25,0,0 + PRODUCTVERSION 2,25,0,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL\0" - VALUE "FileVersion", "2, 24, 0, 0\0" + VALUE "FileVersion", "2, 25, 0, 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, 0, 0\0" + VALUE "ProductVersion", "2, 25, 0, 0\0" END END BLOCK "VarFileInfo"