Skip to content

Commit

Permalink
[x264] Fix *inx dynamic build (microsoft#13684)
Browse files Browse the repository at this point in the history
* [x264] Fix *inx dynamic build

* bump version
  • Loading branch information
JackBoosY authored Sep 28, 2020
1 parent b9be644 commit a8c046b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ports/x264/CONTROL
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 2 additions & 2 deletions ports/x264/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down

0 comments on commit a8c046b

Please sign in to comment.