From 7e71d0586c2c179750cded0537a272242b5b9d3c Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 28 Jun 2022 18:50:44 -0700 Subject: [PATCH] Updated version to 2.19.3 for RC build --- CHANGES.txt | 1 + CMakeLists.txt | 2 +- Makefile.os2 | 2 +- SDL_ttf.h | 2 +- VisualC/Version.rc | 8 ++++---- Xcode/Info-Framework.plist | 4 ++-- Xcode/SDL_ttf.xcodeproj/project.pbxproj | 4 ++-- configure | 2 +- configure.ac | 2 +- version.rc | 8 ++++---- 10 files changed, 18 insertions(+), 17 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 5468aa11..592ec460 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.20.0: + * Added support for building with CMake * Added TTF_GetFontWrappedAlign() and TTF_SetFontWrappedAlign() to set alignment on wrapped text * Added functions to render using FreeType LCD algorithm: TTF_RenderText_LCD() diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f207276..04988110 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") # See docs/release_checklist.md set(MAJOR_VERSION 2) set(MINOR_VERSION 19) -set(MICRO_VERSION 2) +set(MICRO_VERSION 3) set(SDL_REQUIRED_VERSION 2.0.10) # For historical reasons this is 15.0.0 rather than the expected 1.0.0 diff --git a/Makefile.os2 b/Makefile.os2 index 5249a00d..d3611783 100644 --- a/Makefile.os2 +++ b/Makefile.os2 @@ -7,7 +7,7 @@ LIBNAME = SDL2ttf MAJOR_VERSION = 2 MINOR_VERSION = 19 -MICRO_VERSION = 2 +MICRO_VERSION = 3 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION) TITLENAME = $(LIBNAME) $(VERSION) diff --git a/SDL_ttf.h b/SDL_ttf.h index afcbf11b..b64e0d56 100644 --- a/SDL_ttf.h +++ b/SDL_ttf.h @@ -49,7 +49,7 @@ extern "C" { */ #define SDL_TTF_MAJOR_VERSION 2 #define SDL_TTF_MINOR_VERSION 19 -#define SDL_TTF_PATCHLEVEL 2 +#define SDL_TTF_PATCHLEVEL 3 /** * This macro can be used to fill a version structure with the compile-time diff --git a/VisualC/Version.rc b/VisualC/Version.rc index 608b97ce..73ad188c 100644 --- a/VisualC/Version.rc +++ b/VisualC/Version.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,19,2,0 - PRODUCTVERSION 2,19,2,0 + FILEVERSION 2,19,3,0 + PRODUCTVERSION 2,19,3,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,12 +46,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL_ttf\0" - VALUE "FileVersion", "2, 19, 2, 0\0" + VALUE "FileVersion", "2, 19, 3, 0\0" VALUE "InternalName", "SDL_ttf\0" VALUE "LegalCopyright", "Copyright © 2022 Sam Lantinga\0" VALUE "OriginalFilename", "SDL_ttf.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "2, 19, 2, 0\0" + VALUE "ProductVersion", "2, 19, 3, 0\0" END END BLOCK "VarFileInfo" diff --git a/Xcode/Info-Framework.plist b/Xcode/Info-Framework.plist index f1ad1c1d..6a9510fc 100644 --- a/Xcode/Info-Framework.plist +++ b/Xcode/Info-Framework.plist @@ -15,8 +15,8 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.19.2 + 2.19.3 CFBundleVersion - 2.19.2 + 2.19.3 diff --git a/Xcode/SDL_ttf.xcodeproj/project.pbxproj b/Xcode/SDL_ttf.xcodeproj/project.pbxproj index 09bdae04..de3d71e6 100644 --- a/Xcode/SDL_ttf.xcodeproj/project.pbxproj +++ b/Xcode/SDL_ttf.xcodeproj/project.pbxproj @@ -985,7 +985,7 @@ CLANG_CXX_LIBRARY = "libc++"; COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 15.0.0; - DYLIB_CURRENT_VERSION = 1903.0.0; + DYLIB_CURRENT_VERSION = 1904.0.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/$(PLATFORM)\""; @@ -1025,7 +1025,7 @@ CLANG_CXX_LIBRARY = "libc++"; DEPLOYMENT_POSTPROCESSING = YES; DYLIB_COMPATIBILITY_VERSION = 15.0.0; - DYLIB_CURRENT_VERSION = 1903.0.0; + DYLIB_CURRENT_VERSION = 1904.0.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/$(PLATFORM)\""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; diff --git a/configure b/configure index 5fc80625..2daefdcf 100755 --- a/configure +++ b/configure @@ -3362,7 +3362,7 @@ MAJOR_VERSION=2 MINOR_VERSION=19 -MICRO_VERSION=2 +MICRO_VERSION=3 BINARY_AGE=`expr $MINOR_VERSION \* 100 + $MICRO_VERSION` diff --git a/configure.ac b/configure.ac index ca9220fc..97113404 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Set various version strings - taken gratefully from the GTk sources # See docs/release_checklist.md m4_define([MAJOR_VERSION_MACRO], [2]) m4_define([MINOR_VERSION_MACRO], [19]) -m4_define([MICRO_VERSION_MACRO], [2]) +m4_define([MICRO_VERSION_MACRO], [3]) AC_INIT([SDL2_ttf], [MAJOR_VERSION_MACRO.MINOR_VERSION_MACRO.MICRO_VERSION_MACRO], diff --git a/version.rc b/version.rc index c8872e63..8f7db85a 100644 --- a/version.rc +++ b/version.rc @@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,19,2,0 - PRODUCTVERSION 2,19,2,0 + FILEVERSION 2,19,3,0 + PRODUCTVERSION 2,19,3,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL_ttf\0" - VALUE "FileVersion", "2, 19, 2, 0\0" + VALUE "FileVersion", "2, 19, 3, 0\0" VALUE "InternalName", "SDL_ttf\0" VALUE "LegalCopyright", "Copyright © 2022 Sam Lantinga\0" VALUE "OriginalFilename", "SDL_ttf.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "2, 19, 2, 0\0" + VALUE "ProductVersion", "2, 19, 3, 0\0" END END BLOCK "VarFileInfo"