[sdl2] Fix improper replacement of -lSDL2main + remove IGNORE_FLAGS and SYSTEM_LIBRARIES (#15540)

* [sdl2] Proper replacement of -lSDL2main -> -lSDL2maind

* [sdl2] Add extra SYSTEM_LIBRARIES and IGNORE_FLAGS

* [sdl2] Remove SYSTEM_LIBRARIES and IGNORE_FLAGS

* update baseline

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
This commit is contained in:
Long Nguyen 2021-01-25 14:21:41 +07:00 коммит произвёл GitHub
Родитель f60b947e13
Коммит 124f5d912b
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 11 добавлений и 9 удалений

Просмотреть файл

@ -71,9 +71,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME)
file(GLOB SHARE_FILES ${CURRENT_PACKAGES_DIR}/share/sdl2/*.cmake)
foreach(SHARE_FILE ${SHARE_FILES})
file(READ "${SHARE_FILE}" _contents)
string(REPLACE "lib/SDL2main" "lib/manual-link/SDL2main" _contents "${_contents}")
file(WRITE "${SHARE_FILE}" "${_contents}")
vcpkg_replace_string("${SHARE_FILE}" "lib/SDL2main" "lib/manual-link/SDL2main")
endforeach()
endif()
@ -89,10 +87,8 @@ 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" "-lSDL2" "-lSDL2d")
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 ")
endif()
vcpkg_fixup_pkgconfig(
IGNORE_FLAGS "-Wl,-rpath,${CURRENT_PACKAGES_DIR}/lib/pkgconfig/../../lib" "-Wl,-rpath,${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/../../lib" "-Wl,--enable-new-dtags" "-Wl,--no-undefined" "-Wl,-undefined,error" "-Wl,-compatibility_version,${DYLIB_COMPATIBILITY_VERSION}" "-Wl,-current_version,${DYLIB_CURRENT_VERSION}" "-Wl,-weak_framework,Metal" "-Wl,-weak_framework,QuartzCore"
SYSTEM_LIBRARIES dbus-1
)
vcpkg_fixup_pkgconfig()

Просмотреть файл

@ -1,6 +1,7 @@
{
"name": "sdl2",
"version-string": "2.0.14",
"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",
"features": {

Просмотреть файл

@ -5202,7 +5202,7 @@
},
"sdl2": {
"baseline": "2.0.14",
"port-version": 0
"port-version": 1
},
"sdl2-gfx": {
"baseline": "1.0.4",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8d5fa523a69780e41605b585788d212d688f3c71",
"version-string": "2.0.14",
"port-version": 1
},
{
"git-tree": "10ed256500fea4cd6cc5d3e6c6b5f2e9e364d78b",
"version-string": "2.0.14",