From 78cc5c173404488d80751af226d1eaf67033bcc4 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 1 Nov 2024 14:27:01 -0700 Subject: [PATCH] Updated to version 3.1.6 for the preview release --- CMakeLists.txt | 2 +- Xcode/SDL/Info-Framework.plist | 4 ++-- Xcode/SDL/SDL.xcodeproj/project.pbxproj | 12 ++++++------ Xcode/SDL/pkg-support/SDL.info | 2 +- .../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, 17 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e12e12e8d23c0..217d9f55a3a4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.16) # See docs/release_checklist.md -project(SDL3 LANGUAGES C VERSION "3.1.5") +project(SDL3 LANGUAGES C VERSION "3.1.6") if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) set(SDL3_SUBPROJECT OFF) diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist index 41879e24f13e3..8e9f72f49c3a5 100644 --- a/Xcode/SDL/Info-Framework.plist +++ b/Xcode/SDL/Info-Framework.plist @@ -19,10 +19,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.1.5 + 3.1.6 CFBundleSignature SDLX CFBundleVersion - 3.1.5 + 3.1.6 diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj index bfd2584dcb3a6..307010791c713 100644 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj @@ -3081,8 +3081,8 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; DEPLOYMENT_POSTPROCESSING = YES; - DYLIB_COMPATIBILITY_VERSION = 106.0.0; - DYLIB_CURRENT_VERSION = 106.0.0; + DYLIB_COMPATIBILITY_VERSION = 107.0.0; + DYLIB_CURRENT_VERSION = 107.0.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_ALTIVEC_EXTENSIONS = YES; @@ -3114,7 +3114,7 @@ "@loader_path/Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.11; - MARKETING_VERSION = 3.1.5; + MARKETING_VERSION = 3.1.6; OTHER_LDFLAGS = "$(CONFIG_FRAMEWORK_LDFLAGS)"; PRODUCT_BUNDLE_IDENTIFIER = org.libsdl.SDL3; PRODUCT_NAME = SDL3; @@ -3142,8 +3142,8 @@ ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - DYLIB_COMPATIBILITY_VERSION = 106.0.0; - DYLIB_CURRENT_VERSION = 106.0.0; + DYLIB_COMPATIBILITY_VERSION = 107.0.0; + DYLIB_CURRENT_VERSION = 107.0.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -3175,7 +3175,7 @@ "@loader_path/Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.11; - MARKETING_VERSION = 3.1.5; + MARKETING_VERSION = 3.1.6; 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 670e3e9b2a972..08b21172aa759 100644 --- a/Xcode/SDL/pkg-support/SDL.info +++ b/Xcode/SDL/pkg-support/SDL.info @@ -1,4 +1,4 @@ -Title SDL 3.1.5 +Title SDL 3.1.6 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 ae1f62eb5ef2a..236819982ea54 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 = 1; - private static final int SDL_MICRO_VERSION = 5; + private static final int SDL_MICRO_VERSION = 6; /* // Display InputType.SOURCE/CLASS of events and devices // diff --git a/include/SDL3/SDL.h b/include/SDL3/SDL.h index b7a1a5b6a4b06..53c298b9d5792 100644 --- a/include/SDL3/SDL.h +++ b/include/SDL3/SDL.h @@ -22,7 +22,7 @@ /** * \file SDL.h * - * Main include header for the SDL library, version 3.1.5 + * Main include header for the SDL library, version 3.1.6 */ #ifndef SDL_h_ diff --git a/include/SDL3/SDL_version.h b/include/SDL3/SDL_version.h index f21db4f4088f0..f61b5f33ccbae 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.1.3. */ -#define SDL_MICRO_VERSION 5 +#define SDL_MICRO_VERSION 6 /** * 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 6d267503ee26d..025a07eb3014a 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,1,5,0 - PRODUCTVERSION 3,1,5,0 + FILEVERSION 3,1,6,0 + PRODUCTVERSION 3,1,6,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL\0" - VALUE "FileVersion", "3, 1, 5, 0\0" + VALUE "FileVersion", "3, 1, 6, 0\0" VALUE "InternalName", "SDL\0" VALUE "LegalCopyright", "Copyright (C) 2024 Sam Lantinga\0" VALUE "OriginalFilename", "SDL3.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "3, 1, 5, 0\0" + VALUE "ProductVersion", "3, 1, 6, 0\0" END END BLOCK "VarFileInfo"