From 5330041ea9767fc9488e3c46434fb0791002a550 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 8 Feb 2025 09:15:11 -0800 Subject: [PATCH] Updated to version 2.33.0 for development --- CMakeLists.txt | 2 +- Makefile.os2 | 2 +- Makefile.w32 | 2 +- Xcode/SDL/Info-Framework.plist | 4 ++-- Xcode/SDL/SDL.xcodeproj/project.pbxproj | 20 +++++++++---------- Xcode/SDL/pkg-support/SDL.info | 2 +- .../main/java/org/libsdl/app/SDLActivity.java | 2 +- configure | 2 +- configure.ac | 2 +- include/SDL_version.h | 2 +- src/main/windows/version.rc | 8 ++++---- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 30ff00adf9..afd4e13eb7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,7 +88,7 @@ endif() # See docs/release_checklist.md set(SDL_MAJOR_VERSION 2) -set(SDL_MINOR_VERSION 32) +set(SDL_MINOR_VERSION 33) 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 f35395ab20..113ae2ac74 100644 --- a/Makefile.os2 +++ b/Makefile.os2 @@ -14,7 +14,7 @@ LIBNAME = SDL2 MAJOR_VERSION = 2 -MINOR_VERSION = 32 +MINOR_VERSION = 33 MICRO_VERSION = 0 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION) DESCRIPTION = Simple DirectMedia Layer 2 diff --git a/Makefile.w32 b/Makefile.w32 index 40ff9cca97..a3901beb2b 100644 --- a/Makefile.w32 +++ b/Makefile.w32 @@ -5,7 +5,7 @@ LIBNAME = SDL2 MAJOR_VERSION = 2 -MINOR_VERSION = 32 +MINOR_VERSION = 33 MICRO_VERSION = 0 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION) diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist index 42092c3b78..a383a2e7b6 100644 --- a/Xcode/SDL/Info-Framework.plist +++ b/Xcode/SDL/Info-Framework.plist @@ -19,10 +19,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.32.0 + 2.33.0 CFBundleSignature SDLX CFBundleVersion - 2.32.0 + 2.33.0 diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj index 80949aefbb..caa62eee31 100644 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj @@ -9728,8 +9728,8 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEPLOYMENT_POSTPROCESSING = YES; - DYLIB_COMPATIBILITY_VERSION = 3201.0.0; - DYLIB_CURRENT_VERSION = 3201.0.0; + DYLIB_COMPATIBILITY_VERSION = 3301.0.0; + DYLIB_CURRENT_VERSION = 3301.0.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_ALTIVEC_EXTENSIONS = YES; @@ -9770,7 +9770,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_LINK_OBJC_RUNTIME = NO; - MARKETING_VERSION = 2.32.0; + MARKETING_VERSION = 2.33.0; OTHER_LDFLAGS = "-liconv"; }; name = Release; @@ -9813,8 +9813,8 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; DEBUG_INFORMATION_FORMAT = dwarf; - DYLIB_COMPATIBILITY_VERSION = 3201.0.0; - DYLIB_CURRENT_VERSION = 3201.0.0; + DYLIB_COMPATIBILITY_VERSION = 3301.0.0; + DYLIB_CURRENT_VERSION = 3301.0.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -9856,7 +9856,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_LINK_OBJC_RUNTIME = NO; - MARKETING_VERSION = 2.32.0; + MARKETING_VERSION = 2.33.0; OTHER_LDFLAGS = "-liconv"; }; name = Debug; @@ -10062,8 +10062,8 @@ CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 3201.0.0; - DYLIB_CURRENT_VERSION = 3201.0.0; + DYLIB_COMPATIBILITY_VERSION = 3301.0.0; + DYLIB_CURRENT_VERSION = 3301.0.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; @@ -10114,8 +10114,8 @@ CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 3201.0.0; - DYLIB_CURRENT_VERSION = 3201.0.0; + DYLIB_COMPATIBILITY_VERSION = 3301.0.0; + DYLIB_CURRENT_VERSION = 3301.0.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_NS_ASSERTIONS = NO; GCC_C_LANGUAGE_STANDARD = gnu11; diff --git a/Xcode/SDL/pkg-support/SDL.info b/Xcode/SDL/pkg-support/SDL.info index c1a66f7b38..0e490a2339 100644 --- a/Xcode/SDL/pkg-support/SDL.info +++ b/Xcode/SDL/pkg-support/SDL.info @@ -1,4 +1,4 @@ -Title SDL 2.32.0 +Title SDL 2.33.0 Version 1 Description SDL Library for Mac OS X (http://www.libsdl.org) DefaultLocation /Library/Frameworks diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java index 27ecad87df..889326814c 100644 --- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java +++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java @@ -60,7 +60,7 @@ import java.util.Locale; public class SDLActivity extends Activity implements View.OnSystemUiVisibilityChangeListener { private static final String TAG = "SDL"; private static final int SDL_MAJOR_VERSION = 2; - private static final int SDL_MINOR_VERSION = 32; + private static final int SDL_MINOR_VERSION = 33; private static final int SDL_MICRO_VERSION = 0; /* // Display InputType.SOURCE/CLASS of events and devices diff --git a/configure b/configure index 5b9dbeed6e..2fa617fbd4 100755 --- a/configure +++ b/configure @@ -3515,7 +3515,7 @@ orig_CFLAGS="$CFLAGS" # See docs/release_checklist.md SDL_MAJOR_VERSION=2 -SDL_MINOR_VERSION=32 +SDL_MINOR_VERSION=33 SDL_MICRO_VERSION=0 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION diff --git a/configure.ac b/configure.ac index 1f7e8dc2d0..c6d44a174f 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=32 +SDL_MINOR_VERSION=33 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 32d1133bee..825d5c8c0a 100644 --- a/include/SDL_version.h +++ b/include/SDL_version.h @@ -57,7 +57,7 @@ typedef struct SDL_version /* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL */ #define SDL_MAJOR_VERSION 2 -#define SDL_MINOR_VERSION 32 +#define SDL_MINOR_VERSION 33 #define SDL_PATCHLEVEL 0 /** diff --git a/src/main/windows/version.rc b/src/main/windows/version.rc index 42ba606fe4..b61e89a115 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,32,0,0 - PRODUCTVERSION 2,32,0,0 + FILEVERSION 2,33,0,0 + PRODUCTVERSION 2,33,0,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL\0" - VALUE "FileVersion", "2, 32, 0, 0\0" + VALUE "FileVersion", "2, 33, 0, 0\0" VALUE "InternalName", "SDL\0" VALUE "LegalCopyright", "Copyright (C) 2025 Sam Lantinga\0" VALUE "OriginalFilename", "SDL2.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "2, 32, 0, 0\0" + VALUE "ProductVersion", "2, 33, 0, 0\0" END END BLOCK "VarFileInfo"