From 3fe2d8368cbbb400c33a3fde7d35f157278a823e Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 22 Sep 2019 10:37:16 -0700 Subject: [PATCH] Updated SDL development builds to version 2.0.11 --- CMakeLists.txt | 4 ++-- Xcode/SDL/Info-Framework.plist | 4 ++-- Xcode/SDL/SDL.xcodeproj/project.pbxproj | 4 ++-- build-scripts/winrtbuild.ps1 | 2 +- configure | 4 ++-- configure.ac | 4 ++-- debian/changelog | 8 +++++++- include/SDL_version.h | 2 +- src/main/windows/version.rc | 8 ++++---- 9 files changed, 23 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d381238b4ccd5..6962c5fa41278 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,9 +42,9 @@ include(${SDL2_SOURCE_DIR}/cmake/sdlchecks.cmake) # set SDL_BINARY_AGE and SDL_INTERFACE_AGE to 0. set(SDL_MAJOR_VERSION 2) set(SDL_MINOR_VERSION 0) -set(SDL_MICRO_VERSION 10) +set(SDL_MICRO_VERSION 11) set(SDL_INTERFACE_AGE 0) -set(SDL_BINARY_AGE 10) +set(SDL_BINARY_AGE 11) set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}") # the following should match the versions in Xcode project file: set(DYLIB_CURRENT_VERSION 10.0.0) diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist index 1547584f3f26a..ae10c18d7fe08 100644 --- a/Xcode/SDL/Info-Framework.plist +++ b/Xcode/SDL/Info-Framework.plist @@ -19,10 +19,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.10 + 2.0.11 CFBundleSignature SDLX CFBundleVersion - 2.0.10 + 2.0.11 diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj index 52f13896a6cb6..8e022b40fba74 100644 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj @@ -3156,7 +3156,7 @@ CLANG_LINK_OBJC_RUNTIME = NO; COMBINE_HIDPI_IMAGES = YES; DYLIB_COMPATIBILITY_VERSION = 1.0.0; - DYLIB_CURRENT_VERSION = 11.0.0; + DYLIB_CURRENT_VERSION = 12.0.0; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)", @@ -3255,7 +3255,7 @@ CLANG_LINK_OBJC_RUNTIME = NO; COMBINE_HIDPI_IMAGES = YES; DYLIB_COMPATIBILITY_VERSION = 1.0.0; - DYLIB_CURRENT_VERSION = 11.0.0; + DYLIB_CURRENT_VERSION = 12.0.0; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)", diff --git a/build-scripts/winrtbuild.ps1 b/build-scripts/winrtbuild.ps1 index 6a33d891fd3bb..36db8056ebd55 100644 --- a/build-scripts/winrtbuild.ps1 +++ b/build-scripts/winrtbuild.ps1 @@ -39,7 +39,7 @@ # # Base version of SDL, used for packaging purposes -$SDLVersion = "2.0.10" +$SDLVersion = "2.0.11" # Gets the .bat file that sets up an MSBuild environment, given one of # Visual Studio's, "PlatformToolset"s. diff --git a/configure b/configure index a39a4ad5132e3..7c46e50fcdf5e 100755 --- a/configure +++ b/configure @@ -2813,9 +2813,9 @@ orig_CFLAGS="$CFLAGS" # SDL_MAJOR_VERSION=2 SDL_MINOR_VERSION=0 -SDL_MICRO_VERSION=10 +SDL_MICRO_VERSION=11 SDL_INTERFACE_AGE=0 -SDL_BINARY_AGE=10 +SDL_BINARY_AGE=11 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION diff --git a/configure.ac b/configure.ac index a5c839328ab8c..c91eafaed9ad5 100644 --- a/configure.ac +++ b/configure.ac @@ -20,9 +20,9 @@ dnl Set various version strings - taken gratefully from the GTk sources # SDL_MAJOR_VERSION=2 SDL_MINOR_VERSION=0 -SDL_MICRO_VERSION=10 +SDL_MICRO_VERSION=11 SDL_INTERFACE_AGE=0 -SDL_BINARY_AGE=10 +SDL_BINARY_AGE=11 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION AC_SUBST(SDL_MAJOR_VERSION) diff --git a/debian/changelog b/debian/changelog index fc1daa539320b..9056b2a802c4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ +libsdl2 (2.0.11) UNRELEASED; urgency=low + + * Updated SDL to version 2.0.11 for development builds + + -- Sam Lantinga Sun, 22 Sep 2019 10:33:03 -0800 + libsdl2 (2.0.10) UNRELEASED; urgency=low * Updated SDL to version 2.0.10 - -- Sam Lantinga Mon, 17 Jun 2018 08:48:47 -0800 + -- Sam Lantinga Mon, 17 Jun 2019 08:48:47 -0800 libsdl2 (2.0.9) UNRELEASED; urgency=low diff --git a/include/SDL_version.h b/include/SDL_version.h index 6c7499d320a8d..69b02706b87ed 100644 --- a/include/SDL_version.h +++ b/include/SDL_version.h @@ -59,7 +59,7 @@ typedef struct SDL_version */ #define SDL_MAJOR_VERSION 2 #define SDL_MINOR_VERSION 0 -#define SDL_PATCHLEVEL 10 +#define SDL_PATCHLEVEL 11 /** * \brief Macro to determine SDL version program was compiled against. diff --git a/src/main/windows/version.rc b/src/main/windows/version.rc index 4f5dd69ab8e08..ea29c11177ed4 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,0,10,0 - PRODUCTVERSION 2,0,10,0 + FILEVERSION 2,0,11,0 + PRODUCTVERSION 2,0,11,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL\0" - VALUE "FileVersion", "2, 0, 10, 0\0" + VALUE "FileVersion", "2, 0, 11, 0\0" VALUE "InternalName", "SDL\0" VALUE "LegalCopyright", "Copyright © 2019 Sam Lantinga\0" VALUE "OriginalFilename", "SDL2.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "2, 0, 10, 0\0" + VALUE "ProductVersion", "2, 0, 11, 0\0" END END BLOCK "VarFileInfo"