Skip to content

Commit

Permalink
Update vcpkg.
Browse files Browse the repository at this point in the history
  • Loading branch information
henricj committed Jun 29, 2024
1 parent 0126f7a commit 7cba253
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 151 deletions.
1 change: 0 additions & 1 deletion external/vcpkg/config/ports/sdl2-mixer/.gitattributes

This file was deleted.

13 changes: 0 additions & 13 deletions external/vcpkg/config/ports/sdl2-mixer/fix-pkg-prefix.patch

This file was deleted.

64 changes: 0 additions & 64 deletions external/vcpkg/config/ports/sdl2-mixer/portfile.cmake

This file was deleted.

4 changes: 0 additions & 4 deletions external/vcpkg/config/ports/sdl2-mixer/usage

This file was deleted.

56 changes: 0 additions & 56 deletions external/vcpkg/config/ports/sdl2-mixer/vcpkg.json

This file was deleted.

10 changes: 5 additions & 5 deletions external/vcpkg/config/ports/sdl2/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libsdl-org/SDL
REF "release-${VERSION}"
SHA512 c7635a83a52f3970a372b804a8631f0a7e6b8d89aed1117bcc54a2040ad0928122175004cf2b42cf84a4fd0f86236f779229eaa63dfa6ca9c89517f999c5ff1c
SHA512 3a7c6c0515205338a023ada230128e658f4ecff3ccd371d33cd9bb82eb4992db972241faf44f325f7d536c7dedb0a02ee1574b7a84ba3c9856cae9e6d25bdbdc
HEAD_REF main
PATCHES
disable-dynapi.patch
Expand Down Expand Up @@ -93,7 +93,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP AND NOT VCPKG_TARGET_IS_M

file(GLOB SHARE_FILES "${CURRENT_PACKAGES_DIR}/share/sdl2/*.cmake")
foreach(SHARE_FILE ${SHARE_FILES})
vcpkg_replace_string("${SHARE_FILE}" "lib/SDL2main" "lib/manual-link/SDL2main")
vcpkg_replace_string("${SHARE_FILE}" "lib/SDL2main" "lib/manual-link/SDL2main" IGNORE_UNCHANGED)
endforeach()
endif()

Expand All @@ -107,9 +107,9 @@ string(REGEX REPLACE ${DYLIB_COMPATIBILITY_VERSION_REGEX} "\\1" DYLIB_COMPATIBIL
string(REGEX REPLACE ${DYLIB_CURRENT_VERSION_REGEX} "\\1" DYLIB_CURRENT_VERSION "${DYLIB_CURRENT_VERSION}")

if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2main" "-lSDL2maind")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2 " "-lSDL2d ")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2-static " "-lSDL2-staticd ")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2main" "-lSDL2maind" IGNORE_UNCHANGED)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2 " "-lSDL2d " IGNORE_UNCHANGED)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2-static " "-lSDL2-staticd " IGNORE_UNCHANGED)
endif()

if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
Expand Down
3 changes: 2 additions & 1 deletion external/vcpkg/config/ports/sdl2/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "sdl2",
"version": "2.30.0",
"version": "2.30.3",
"port-version": 1,
"description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.",
"homepage": "https://www.libsdl.org/download-2.0.php",
"license": "Zlib",
Expand Down
3 changes: 1 addition & 2 deletions external/vcpkg/config/vcpkg-configuration.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"overlay-ports": [
"./ports/sdl2",
"./ports/sdl2-mixer"
"./ports/sdl2"
],
"overlay-triplets": [
"./triplets"
Expand Down
20 changes: 16 additions & 4 deletions external/vcpkg/config/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,21 @@
"gtest",
"lodepng",
"ms-gsl",
"sdl2",
"sdl2-mixer",
"sdl2-ttf",
"soxr"
{
"name": "sdl2",
"default-features": false
},
{
"name": "sdl2-mixer",
"default-features": false
},
{
"name": "sdl2-ttf",
"default-features": false
},
{
"name": "soxr",
"default-features": false
}
]
}
2 changes: 1 addition & 1 deletion external/vcpkg/vcpkg
Submodule vcpkg updated 3649 files

0 comments on commit 7cba253

Please sign in to comment.