diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-05-09 05:33:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-08 14:33:58 -0700 |
| commit | e179c4b3bc58f9793f36a2d9420e94a06f31415d (patch) | |
| tree | e51efd4b82b4fb8ec40294a7ba28caadb4fb5e32 | |
| parent | 58560e53d85b2491b5c9c23da5e7b8547478c9a5 (diff) | |
| download | vcpkg-e179c4b3bc58f9793f36a2d9420e94a06f31415d.tar.gz vcpkg-e179c4b3bc58f9793f36a2d9420e94a06f31415d.zip | |
[sfml] Remove unnecessary patch (#11246)
| -rw-r--r-- | ports/sfml/CONTROL | 2 | ||||
| -rw-r--r-- | ports/sfml/export-win-libs.patch | 26 | ||||
| -rw-r--r-- | ports/sfml/portfile.cmake | 1 |
3 files changed, 1 insertions, 28 deletions
diff --git a/ports/sfml/CONTROL b/ports/sfml/CONTROL index a62fb278a..6f46156a9 100644 --- a/ports/sfml/CONTROL +++ b/ports/sfml/CONTROL @@ -1,5 +1,5 @@ Source: sfml -Version: 2.5.1-6 +Version: 2.5.1-7 Homepage: https://github.com/sfml/sfml Description: Simple and fast multimedia library Build-Depends: freetype, libflac, libogg, libvorbis, openal-soft, stb diff --git a/ports/sfml/export-win-libs.patch b/ports/sfml/export-win-libs.patch deleted file mode 100644 index 210b6e52e..000000000 --- a/ports/sfml/export-win-libs.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/SFML/System/CMakeLists.txt b/src/SFML/System/CMakeLists.txt -index d1b712d..5c12801 100644 ---- a/src/SFML/System/CMakeLists.txt -+++ b/src/SFML/System/CMakeLists.txt -@@ -96,7 +96,7 @@ endif() - if(SFML_OS_LINUX) - target_link_libraries(sfml-system PRIVATE rt) - elseif(SFML_OS_WINDOWS) -- target_link_libraries(sfml-system PRIVATE winmm) -+ target_link_libraries(sfml-system PUBLIC winmm) - elseif(SFML_OS_ANDROID) - target_link_libraries(sfml-system PRIVATE android log) - endif() -diff --git a/src/SFML/Window/CMakeLists.txt b/src/SFML/Window/CMakeLists.txt -index 98ea439..53c1ac7 100644 ---- a/src/SFML/Window/CMakeLists.txt -+++ b/src/SFML/Window/CMakeLists.txt -@@ -276,7 +276,7 @@ if(SFML_OS_LINUX) - sfml_find_package(UDev INCLUDE "UDEV_INCLUDE_DIR" LINK "UDEV_LIBRARIES") - target_link_libraries(sfml-window PRIVATE UDev) - elseif(SFML_OS_WINDOWS) -- target_link_libraries(sfml-window PRIVATE winmm gdi32) -+ target_link_libraries(sfml-window PUBLIC winmm gdi32) - elseif(SFML_OS_FREEBSD) - target_link_libraries(sfml-window PRIVATE usbhid) - elseif(SFML_OS_MACOSX) diff --git a/ports/sfml/portfile.cmake b/ports/sfml/portfile.cmake index d6afbe2c3..efbcdd135 100644 --- a/ports/sfml/portfile.cmake +++ b/ports/sfml/portfile.cmake @@ -5,7 +5,6 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59 PATCHES use-system-freetype.patch - export-win-libs.patch ) file(REMOVE_RECURSE ${SOURCE_PATH}/extlibs) |