0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump vcpkg baseline, update for new SDL_image config

Browse source
This commit is contained in:
Charles Dang 2022-11-28 00:33:43 -05:00
parent 965f3049c6
commit 8e6f507910
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -500,7 +500,7 @@ if(ENABLE_GAME OR ENABLE_TESTS)
else()
# for MSVC, vcpkg builds and provides custom SDL2-related modules for cmake to use, so use those
# this also fixes the issue with our previous FindSDL2* scripts incorrectly using the Release version of these libs instead of the Debug version
find_package(sdl2-image CONFIG REQUIRED)
find_package(SDL2_image CONFIG REQUIRED)
find_package(SDL2_mixer CONFIG REQUIRED)
endif()
pkg_check_modules(CAIRO REQUIRED cairo>=1.10)

4
src/CMakeLists.txt
View file

@ -250,7 +250,7 @@ if(ENABLE_GAME)
SDL2::SDL2main
)
if(MSVC)
target_link_libraries(wesnoth SDL2::SDL2_image)
target_link_libraries(wesnoth SDL2_image::SDL2_image)
target_link_libraries(wesnoth SDL2_mixer::SDL2_mixer)
endif()
@ -297,7 +297,7 @@ if(ENABLE_TESTS)
SDL2::SDL2main
)
if(MSVC)
target_link_libraries(boost_unit_tests SDL2::SDL2_image)
target_link_libraries(boost_unit_tests SDL2_image::SDL2_image)
target_link_libraries(boost_unit_tests SDL2_mixer::SDL2_mixer)
endif()

2
vcpkg.json
View file

@ -2,7 +2,7 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
"name": "wesnoth-dependencies",
"version": "0.0.1",
"builtin-baseline": "68ad399d5596a540e8a12173c3d189cbc0f82be8",
"builtin-baseline": "62d01b70df227850b728f5050418b917ad6d2b32",
"dependencies": [
"sdl2",
{