diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-09-27 17:58:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-27 17:58:17 -0700 |
| commit | a8c046b4833e6d89325f795c1ae189e4e2e26733 (patch) | |
| tree | 9c42e922c55aa546cc332e853f983ca0110ac852 | |
| parent | b9be644f8b851c67a9fa42941331167d6da4b14c (diff) | |
| download | vcpkg-a8c046b4833e6d89325f795c1ae189e4e2e26733.tar.gz vcpkg-a8c046b4833e6d89325f795c1ae189e4e2e26733.zip | |
[x264] Fix *inx dynamic build (#13684)
* [x264] Fix *inx dynamic build
* bump version
| -rw-r--r-- | ports/x264/CONTROL | 2 | ||||
| -rw-r--r-- | ports/x264/portfile.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/x264/CONTROL b/ports/x264/CONTROL index 565775b15..c3f2c7e95 100644 --- a/ports/x264/CONTROL +++ b/ports/x264/CONTROL @@ -1,6 +1,6 @@ Source: x264 Version: 157-303c484ec828ed0 -Port-Version: 10 +Port-Version: 11 Homepage: https://github.com/mirror/x264 Description: x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format Build-Depends: pthread (linux&osx) diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index 1d1bc2392..83544bd54 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -58,10 +58,10 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/lib/libx264.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.lib) -else() +elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") # force U_STATIC_IMPLEMENTATION macro file(READ ${CURRENT_PACKAGES_DIR}/include/x264.h HEADER_CONTENTS) string(REPLACE "defined(U_STATIC_IMPLEMENTATION)" "1" HEADER_CONTENTS "${HEADER_CONTENTS}") |