mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 03:03:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[sfml] Remove unnecessary patch (#11246)

Browse Source
This commit is contained in:
Jack·Boos·Yu 2020-05-09 05:33:58 +08:00 committed by GitHub
parent 58560e53d8
commit e179c4b3bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/sfml/CONTROL
View File

@ -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

26
ports/sfml/export-win-libs.patch
View File

@ -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)

1
ports/sfml/portfile.cmake
View File

@ -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)