Skip to content

Commit a730b64

Browse files
authored
Update 'SDL_image' package to v2.0.5-p0 (#451)
1 parent 1e2f851 commit a730b64

File tree

4 files changed

+30
-6
lines changed

4 files changed

+30
-6
lines changed

cmake/configs/default.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ hunter_default_version(RapidJSON VERSION 1.1.0-b557259-p0)
144144
hunter_default_version(RapidXML VERSION 1.13)
145145
hunter_default_version(RedisClient VERSION 0.6.1-p1)
146146
hunter_default_version(SDL2 VERSION 2.0.12-p0)
147-
hunter_default_version(SDL_image VERSION 2.0.1-p1)
147+
hunter_default_version(SDL_image VERSION 2.0.5-p0)
148148
hunter_default_version(SDL_mixer VERSION 2.0.2-p0)
149149
hunter_default_version(SDL_ttf VERSION 2.0.15-p0)
150150
hunter_default_version(SFML VERSION 2.5.1-p0)

cmake/projects/SDL_image/hunter.cmake

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

9+
hunter_add_version(
10+
PACKAGE_NAME
11+
SDL_image
12+
VERSION
13+
"2.0.5-p0"
14+
URL
15+
"https://github.com/cpp-pm/SDL_image/archive/v2.0.5-p0.tar.gz"
16+
SHA1
17+
7c93e53ad122364bb934e90dac265d88f768a4ed
18+
)
19+
920
hunter_add_version(
1021
PACKAGE_NAME
1122
SDL_image
1223
VERSION
1324
"2.0.1-p1"
1425
URL
15-
"https://github.com/hunter-packages/SDL_image_cmake/archive/2.0.1-p1.tar.gz"
26+
"https://github.com/cpp-pm/SDL_image_cmake_legacy/archive/2.0.1-p1.tar.gz"
1627
SHA1
17-
8f644d026256f48f0e2ba5411422eaf2a91c0463
28+
a36f0617b0d22e9960ef931b43ecbcb6a9df165f
1829
)
1930

2031
hunter_pick_scheme(DEFAULT url_sha1_cmake)

docs/packages/pkg/SDL_image.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ SDL_image
1010
=========
1111

1212
- `Official <https://www.libsdl.org/projects/SDL_image/>`__
13-
- `Hunterized <https://github.com/hunter-packages/SDL_image_cmake/>`__
13+
- `Hunterized <https://github.com/cpp-pm/SDL_image/>`__
1414
- `Example <https://github.com/cpp-pm/hunter/blob/master/examples/SDL_image/CMakeLists.txt>`__
1515
- Available since `v0.19.86 <https://github.com/cpp-pm/hunter/releases/tag/v0.19.86>`__
1616
- Added by `wheybags <https://github.com/wheybags>`__ (`pr-989 <https://github.com/ruslo/hunter/pull/989>`__)

examples/SDL_image/CMakeLists.txt

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,20 @@ project(SDL_image-test)
99
hunter_add_package(SDL_image)
1010
find_package(SDL_image CONFIG REQUIRED)
1111

12-
add_executable(main main.cpp)
12+
if(ANDROID)
13+
add_library(main SHARED main.cpp)
14+
else()
15+
add_executable(main main.cpp)
16+
endif()
17+
18+
# Fix MinGW / MSYS build
19+
if(MINGW OR MSYS)
20+
target_link_libraries(main
21+
mingw32
22+
)
23+
endif()
24+
1325
target_link_libraries(main
1426
SDL_image::SDL_image
15-
SDL2::SDL2main)
27+
SDL2::SDL2main
28+
SDL2::SDL2)

0 commit comments

Comments
 (0)