Skip to content

Commit

Permalink
Updated to version 2.20.1 for release
Browse files Browse the repository at this point in the history
  • Loading branch information
slouken committed Aug 19, 2022
1 parent e1e1181 commit 0a652b5
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 16 deletions.
3 changes: 3 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile.os2
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion SDL_ttf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions VisualC/Version.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions Xcode/Info-Framework.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.20.0</string>
<string>2.20.1</string>
<key>CFBundleVersion</key>
<string>2.20.0</string>
<string>2.20.1</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions Xcode/SDL_ttf.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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)\"";
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
8 changes: 4 additions & 4 deletions version.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down

0 comments on commit 0a652b5

Please sign in to comment.