From 0bfeed061b10ea7dd37c88d9bae1824bad760f3a Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Mon, 21 Nov 2022 16:15:58 -0800
Subject: [PATCH] Updated to version 2.26.0 for release
---
CMakeLists.txt | 4 ++--
Makefile.os2 | 4 ++--
Makefile.w32 | 4 ++--
Xcode/SDL/Info-Framework.plist | 4 ++--
Xcode/SDL/SDL.xcodeproj/project.pbxproj | 16 ++++++++--------
.../main/java/org/libsdl/app/SDLActivity.java | 4 ++--
configure | 4 ++--
configure.ac | 4 ++--
include/SDL_version.h | 4 ++--
src/main/windows/version.rc | 8 ++++----
10 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ffd9de7efa05..021b66cd5731 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,8 +85,8 @@ endif()
# See docs/release_checklist.md
set(SDL_MAJOR_VERSION 2)
-set(SDL_MINOR_VERSION 25)
-set(SDL_MICRO_VERSION 1)
+set(SDL_MINOR_VERSION 26)
+set(SDL_MICRO_VERSION 0)
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 111ea0eef89a..2e38ed0d4708 100644
--- a/Makefile.os2
+++ b/Makefile.os2
@@ -14,8 +14,8 @@
LIBNAME = SDL2
MAJOR_VERSION = 2
-MINOR_VERSION = 25
-MICRO_VERSION = 1
+MINOR_VERSION = 26
+MICRO_VERSION = 0
VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
DESCRIPTION = Simple DirectMedia Layer 2
diff --git a/Makefile.w32 b/Makefile.w32
index 628ee7ed6962..82609036b979 100644
--- a/Makefile.w32
+++ b/Makefile.w32
@@ -5,8 +5,8 @@
LIBNAME = SDL2
MAJOR_VERSION = 2
-MINOR_VERSION = 25
-MICRO_VERSION = 1
+MINOR_VERSION = 26
+MICRO_VERSION = 0
VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
LIBHOME = .
diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist
index 16ca1d1b7130..09bae6c16e89 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>2.25.1</string>
+ <string>2.26.0</string>
<key>CFBundleSignature</key>
<string>SDLX</string>
<key>CFBundleVersion</key>
- <string>2.25.1</string>
+ <string>2.26.0</string>
</dict>
</plist>
diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
index e0f747ab773b..b59a594fb852 100644
--- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
@@ -9528,8 +9528,8 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEPLOYMENT_POSTPROCESSING = YES;
- DYLIB_COMPATIBILITY_VERSION = 2502.0.0;
- DYLIB_CURRENT_VERSION = 2502.0.0;
+ DYLIB_COMPATIBILITY_VERSION = 2601.0.0;
+ DYLIB_CURRENT_VERSION = 2601.0.0;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_ALTIVEC_EXTENSIONS = YES;
@@ -9613,8 +9613,8 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
- DYLIB_COMPATIBILITY_VERSION = 2502.0.0;
- DYLIB_CURRENT_VERSION = 2502.0.0;
+ DYLIB_COMPATIBILITY_VERSION = 2601.0.0;
+ DYLIB_CURRENT_VERSION = 2601.0.0;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@@ -9862,8 +9862,8 @@
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
- DYLIB_COMPATIBILITY_VERSION = 2502.0.0;
- DYLIB_CURRENT_VERSION = 2502.0.0;
+ DYLIB_COMPATIBILITY_VERSION = 2601.0.0;
+ DYLIB_CURRENT_VERSION = 2601.0.0;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
@@ -9914,8 +9914,8 @@
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
- DYLIB_COMPATIBILITY_VERSION = 2502.0.0;
- DYLIB_CURRENT_VERSION = 2502.0.0;
+ DYLIB_COMPATIBILITY_VERSION = 2601.0.0;
+ DYLIB_CURRENT_VERSION = 2601.0.0;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_NS_ASSERTIONS = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
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 e749d6b775a6..90e3ac60b67d 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,8 +60,8 @@
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 = 25;
- private static final int SDL_MICRO_VERSION = 1;
+ private static final int SDL_MINOR_VERSION = 26;
+ private static final int SDL_MICRO_VERSION = 0;
/*
// Display InputType.SOURCE/CLASS of events and devices
//
diff --git a/configure b/configure
index 59d347f3ea49..87c576def58a 100755
--- a/configure
+++ b/configure
@@ -3453,8 +3453,8 @@ orig_CFLAGS="$CFLAGS"
# See docs/release_checklist.md
SDL_MAJOR_VERSION=2
-SDL_MINOR_VERSION=25
-SDL_MICRO_VERSION=1
+SDL_MINOR_VERSION=26
+SDL_MICRO_VERSION=0
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 d8e3dc3daa91..cc30f9a164ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,8 +12,8 @@ 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=25
-SDL_MICRO_VERSION=1
+SDL_MINOR_VERSION=26
+SDL_MICRO_VERSION=0
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 612d2f53d94d..e85fceb34606 100644
--- a/include/SDL_version.h
+++ b/include/SDL_version.h
@@ -58,8 +58,8 @@ typedef struct SDL_version
/* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL
*/
#define SDL_MAJOR_VERSION 2
-#define SDL_MINOR_VERSION 25
-#define SDL_PATCHLEVEL 1
+#define SDL_MINOR_VERSION 26
+#define SDL_PATCHLEVEL 0
/**
* Macro to determine SDL version program was compiled against.
diff --git a/src/main/windows/version.rc b/src/main/windows/version.rc
index 97930ca04eb7..fb2c26890014 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,25,1,0
- PRODUCTVERSION 2,25,1,0
+ FILEVERSION 2,26,0,0
+ PRODUCTVERSION 2,26,0,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x40004L
@@ -23,12 +23,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL\0"
- VALUE "FileVersion", "2, 25, 1, 0\0"
+ VALUE "FileVersion", "2, 26, 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, 25, 1, 0\0"
+ VALUE "ProductVersion", "2, 26, 0, 0\0"
END
END
BLOCK "VarFileInfo"