From 982094c85c2a04e13e69c2b53851290f15cb93f3 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Thu, 6 Feb 2025 16:40:59 -0800
Subject: [PATCH] Updated to version 3.2.5 for development
---
CMakeLists.txt | 2 +-
Xcode/SDL/Info-Framework.plist | 4 ++--
Xcode/SDL/SDL.xcodeproj/project.pbxproj | 8 ++++----
Xcode/SDL/pkg-support/SDL.info | 2 +-
.../app/src/main/java/org/libsdl/app/SDLActivity.java | 2 +-
include/SDL3/SDL.h | 2 +-
include/SDL3/SDL_version.h | 2 +-
src/core/windows/version.rc | 8 ++++----
8 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8e56673825e6..78f36d07b8d5a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ if(NOT DEFINED CMAKE_BUILD_TYPE)
endif()
# See docs/release_checklist.md
-project(SDL3 LANGUAGES C VERSION "3.2.4")
+project(SDL3 LANGUAGES C VERSION "3.2.5")
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
set(SDL3_MAINPROJECT ON)
diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist
index 13d9c51ee13c8..434df98de48de 100644
--- a/Xcode/SDL/Info-Framework.plist
+++ b/Xcode/SDL/Info-Framework.plist
@@ -19,10 +19,10 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
- <string>3.2.4</string>
+ <string>3.2.5</string>
<key>CFBundleSignature</key>
<string>SDLX</string>
<key>CFBundleVersion</key>
- <string>3.2.4</string>
+ <string>3.2.5</string>
</dict>
</plist>
diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
index 2d9714925bae8..bd390d6b3683a 100644
--- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
@@ -3062,7 +3062,7 @@
CLANG_ENABLE_OBJC_ARC = YES;
DEPLOYMENT_POSTPROCESSING = YES;
DYLIB_COMPATIBILITY_VERSION = 201.0.0;
- DYLIB_CURRENT_VERSION = 201.4.0;
+ DYLIB_CURRENT_VERSION = 201.5.0;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_ALTIVEC_EXTENSIONS = YES;
@@ -3097,7 +3097,7 @@
"@loader_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
- MARKETING_VERSION = 3.2.4;
+ MARKETING_VERSION = 3.2.5;
OTHER_LDFLAGS = "$(CONFIG_FRAMEWORK_LDFLAGS)";
PRODUCT_BUNDLE_IDENTIFIER = org.libsdl.SDL3;
PRODUCT_NAME = SDL3;
@@ -3126,7 +3126,7 @@
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
DYLIB_COMPATIBILITY_VERSION = 201.0.0;
- DYLIB_CURRENT_VERSION = 201.4.0;
+ DYLIB_CURRENT_VERSION = 201.5.0;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@@ -3158,7 +3158,7 @@
"@loader_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
- MARKETING_VERSION = 3.2.4;
+ MARKETING_VERSION = 3.2.5;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(CONFIG_FRAMEWORK_LDFLAGS)";
PRODUCT_BUNDLE_IDENTIFIER = org.libsdl.SDL3;
diff --git a/Xcode/SDL/pkg-support/SDL.info b/Xcode/SDL/pkg-support/SDL.info
index 92f65851bc181..1df0e1ab73750 100644
--- a/Xcode/SDL/pkg-support/SDL.info
+++ b/Xcode/SDL/pkg-support/SDL.info
@@ -1,4 +1,4 @@
-Title SDL 3.2.4
+Title SDL 3.2.5
Version 1
Description SDL Library for macOS (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 0684e0a5f8d36..765d8e0150e29 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 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
private static final String TAG = "SDL";
private static final int SDL_MAJOR_VERSION = 3;
private static final int SDL_MINOR_VERSION = 2;
- private static final int SDL_MICRO_VERSION = 4;
+ private static final int SDL_MICRO_VERSION = 5;
/*
// Display InputType.SOURCE/CLASS of events and devices
//
diff --git a/include/SDL3/SDL.h b/include/SDL3/SDL.h
index 4fd4083d30079..c970b6ed2dd4b 100644
--- a/include/SDL3/SDL.h
+++ b/include/SDL3/SDL.h
@@ -20,7 +20,7 @@
*/
/**
- * Main include header for the SDL library, version 3.2.4
+ * Main include header for the SDL library, version 3.2.5
*
* It is almost always best to include just this one header instead of
* picking out individual headers included here. There are exceptions to
diff --git a/include/SDL3/SDL_version.h b/include/SDL3/SDL_version.h
index 2f7e955a502d1..016d36bc1fc0f 100644
--- a/include/SDL3/SDL_version.h
+++ b/include/SDL3/SDL_version.h
@@ -62,7 +62,7 @@ extern "C" {
*
* \since This macro is available since SDL 3.2.0.
*/
-#define SDL_MICRO_VERSION 4
+#define SDL_MICRO_VERSION 5
/**
* This macro turns the version numbers into a numeric value.
diff --git a/src/core/windows/version.rc b/src/core/windows/version.rc
index 4a84a43150b76..21852e36d1c67 100644
--- a/src/core/windows/version.rc
+++ b/src/core/windows/version.rc
@@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,4,0
- PRODUCTVERSION 3,2,4,0
+ FILEVERSION 3,2,5,0
+ PRODUCTVERSION 3,2,5,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x40004L
@@ -23,12 +23,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL\0"
- VALUE "FileVersion", "3, 2, 4, 0\0"
+ VALUE "FileVersion", "3, 2, 5, 0\0"
VALUE "InternalName", "SDL\0"
VALUE "LegalCopyright", "Copyright (C) 2025 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL3.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0"
- VALUE "ProductVersion", "3, 2, 4, 0\0"
+ VALUE "ProductVersion", "3, 2, 5, 0\0"
END
END
BLOCK "VarFileInfo"