diff --git a/CHANGES.txt b/CHANGES.txt index 592ec460..01745ff4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,6 @@ +2.22.1: + * Updated autotools to use ax_compute_relative_paths, fixing homebrew on macOS + 2.20.0: * Added support for building with CMake * Added TTF_GetFontWrappedAlign() and TTF_SetFontWrappedAlign() to set alignment on wrapped text diff --git a/CMakeLists.txt b/CMakeLists.txt index a097d5c9..ebbe692d 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 20) -set(MICRO_VERSION 0) +set(MICRO_VERSION 1) 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 d509a7cb..1ff1efcf 100644 --- a/Makefile.os2 +++ b/Makefile.os2 @@ -7,7 +7,7 @@ LIBNAME = SDL2ttf MAJOR_VERSION = 2 MINOR_VERSION = 20 -MICRO_VERSION = 0 +MICRO_VERSION = 1 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION) TITLENAME = $(LIBNAME) $(VERSION) diff --git a/SDL_ttf.h b/SDL_ttf.h index 9318aebc..70bf7ed5 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 20 -#define SDL_TTF_PATCHLEVEL 0 +#define SDL_TTF_PATCHLEVEL 1 /** * 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 7b36f077..1332f417 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,20,0,0 - PRODUCTVERSION 2,20,0,0 + FILEVERSION 2,20,1,0 + PRODUCTVERSION 2,20,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,12 +46,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL_ttf\0" - VALUE "FileVersion", "2, 20, 0, 0\0" + VALUE "FileVersion", "2, 20, 1, 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, 20, 0, 0\0" + VALUE "ProductVersion", "2, 20, 1, 0\0" END END BLOCK "VarFileInfo" diff --git a/Xcode/Info-Framework.plist b/Xcode/Info-Framework.plist index 7a7c76fd..7866a785 100644 --- a/Xcode/Info-Framework.plist +++ b/Xcode/Info-Framework.plist @@ -15,8 +15,8 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.20.0 + 2.20.1 CFBundleVersion - 2.20.0 + 2.20.1 diff --git a/Xcode/SDL_ttf.xcodeproj/project.pbxproj b/Xcode/SDL_ttf.xcodeproj/project.pbxproj index 9457732f..221c3ba2 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 = 2001.0.0; + DYLIB_CURRENT_VERSION = 2001.1.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 = 2001.0.0; + DYLIB_CURRENT_VERSION = 2001.1.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/$(PLATFORM)\""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; diff --git a/configure.ac b/configure.ac index c265e133..9b1c3635 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], [20]) -m4_define([MICRO_VERSION_MACRO], [0]) +m4_define([MICRO_VERSION_MACRO], [1]) AC_INIT([SDL2_ttf], [MAJOR_VERSION_MACRO.MINOR_VERSION_MACRO.MICRO_VERSION_MACRO], diff --git a/version.rc b/version.rc index c92c1b7a..04705d7c 100644 --- a/version.rc +++ b/version.rc @@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,20,0,0 - PRODUCTVERSION 2,20,0,0 + FILEVERSION 2,20,1,0 + PRODUCTVERSION 2,20,1,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL_ttf\0" - VALUE "FileVersion", "2, 20, 0, 0\0" + VALUE "FileVersion", "2, 20, 1, 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, 20, 0, 0\0" + VALUE "ProductVersion", "2, 20, 1, 0\0" END END BLOCK "VarFileInfo"