Skip to content

Commit 1e2f851

Browse files
authored
Update 'SDL_ttf' package to v2.0.15-p0 (#450)
1 parent 0de3cca commit 1e2f851

File tree

4 files changed

+32
-6
lines changed

4 files changed

+32
-6
lines changed

cmake/configs/default.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ hunter_default_version(RedisClient VERSION 0.6.1-p1)
146146
hunter_default_version(SDL2 VERSION 2.0.12-p0)
147147
hunter_default_version(SDL_image VERSION 2.0.1-p1)
148148
hunter_default_version(SDL_mixer VERSION 2.0.2-p0)
149-
hunter_default_version(SDL_ttf VERSION 2.0.14-p0)
149+
hunter_default_version(SDL_ttf VERSION 2.0.15-p0)
150150
hunter_default_version(SFML VERSION 2.5.1-p0)
151151
hunter_default_version(SPIRV-Headers VERSION 1.5.4.raytracing.fixed)
152152
hunter_default_version(SPIRV-Tools VERSION 2020.4-p0)

cmake/projects/SDL_ttf/hunter.cmake

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,26 @@ include(hunter_cacheable)
66
include(hunter_download)
77
include(hunter_pick_scheme)
88

9+
hunter_add_version(
10+
PACKAGE_NAME
11+
SDL_ttf
12+
VERSION
13+
"2.0.15-p0"
14+
URL
15+
"https://github.com/cpp-pm/SDL_ttf/archive/v2.0.15-p0.tar.gz"
16+
SHA1
17+
a3342fac71e73f140da6bffc5a30c67ba9cfb826
18+
)
19+
920
hunter_add_version(
1021
PACKAGE_NAME
1122
SDL_ttf
1223
VERSION
1324
"2.0.14-p0"
1425
URL
15-
"https://github.com/hunter-packages/SDL_ttf/archive/v2.0.14-p0.tar.gz"
26+
"https://github.com/cpp-pm/SDL_ttf_legacy/archive/v2.0.14-p0.tar.gz"
1627
SHA1
17-
cd7f7806b5de657081d558ef1c12033c43522efe
28+
be9de6d9eb411e9e0910a26a13cd29d234e51906
1829
)
1930

2031
hunter_pick_scheme(DEFAULT url_sha1_cmake)

docs/packages/pkg/SDL_ttf.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ SDL_ttf
1414
:alt: Hunter v0.12.35
1515

1616
- `Official <https://www.libsdl.org/projects/SDL_ttf/>`__
17-
- `Hunterized <https://github.com/hunter-packages/SDL_ttf>`__
17+
- `Hunterized <https://github.com/cpp-pm/SDL_ttf>`__
1818
- `Example <https://github.com/cpp-pm/hunter/blob/master/examples/SDL_ttf/CMakeLists.txt>`__
1919
- Added by `Dennis Biber <https://github.com/db-tech>`__ (`pr-1251 <https://github.com/ruslo/hunter/pull/1251>`__)
2020

examples/SDL_ttf/CMakeLists.txt

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,20 @@ project(download-SDL_ttf)
1212
hunter_add_package(SDL_ttf)
1313
find_package(SDL_ttf CONFIG REQUIRED)
1414

15-
add_executable(SDL_ttf main.cpp)
16-
target_link_libraries(SDL_ttf SDL_ttf::SDL_ttf)
15+
if(ANDROID)
16+
add_library(main SHARED main.cpp)
17+
else()
18+
add_executable(main main.cpp)
19+
endif()
20+
21+
# Fix MinGW / MSYS build
22+
if(MINGW OR MSYS)
23+
target_link_libraries(main
24+
mingw32
25+
)
26+
endif()
27+
28+
target_link_libraries(main
29+
SDL_ttf::SDL_ttf
30+
SDL2::SDL2main
31+
SDL2::SDL2)

0 commit comments

Comments
 (0)