diff --git a/ports/asmjit/CONTROL b/ports/asmjit/CONTROL index 5ec779ce70fb24..d4b46b6a5c4007 100644 --- a/ports/asmjit/CONTROL +++ b/ports/asmjit/CONTROL @@ -1,5 +1,5 @@ Source: asmjit -Version: 2020-05-08 +Version: 2020-07-22 Homepage: https://github.com/asmjit/asmjit Description: Complete x86/x64 JIT and Remote Assembler for C++ Supports: !arm diff --git a/ports/asmjit/portfile.cmake b/ports/asmjit/portfile.cmake index d95645d7e21642..812083b6d919ca 100644 --- a/ports/asmjit/portfile.cmake +++ b/ports/asmjit/portfile.cmake @@ -3,23 +3,23 @@ vcpkg_fail_port_install(ON_ARCH "arm") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO asmjit/asmjit - REF 80645e66a8ae85749937bda3b329388c8a76ea4c - SHA512 8e7b0aed14e8ce05e6e6b2eed77be23a81b9548a146aef187ac6beced3bc2a6cba92835718adb901a1ab983fab32f3e9f18061b157b2276bb1451a71ca1195b8 + REF 8474400e82c3ea65bd828761539e5d9b25f6bd83 + SHA512 435be4ed22abbbbcdea3869b31bc2fc27aae969775773c24155d7490bca9591f51613fa3319cce54200c6d18dbe73a6be2d5449c49afb46934d93760501e98f6 HEAD_REF master ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DASMJIT_STATIC=1 - ) + set(ASMJIT_STATIC 1) else() - vcpkg_configure_cmake( + set(ASMJIT_STATIC 0) +endif() + +vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - ) -endif() + OPTIONS -DASMJIT_STATIC=${ASMJIT_STATIC} + ) + vcpkg_install_cmake() vcpkg_copy_pdbs() diff --git a/ports/polyhook2/CONTROL b/ports/polyhook2/CONTROL index d867d5ebaa666e..924ea7e2a5f38b 100644 --- a/ports/polyhook2/CONTROL +++ b/ports/polyhook2/CONTROL @@ -1,5 +1,5 @@ Source: polyhook2 -Version: 2020-07-01 +Version: 2020-08-04 Homepage: https://github.com/stevemk14ebr/PolyHook_2_0 Description: C++17, x86/x64 Hooking Libary v2.0 Supports: !(arm|uwp|linux|osx) diff --git a/ports/polyhook2/portfile.cmake b/ports/polyhook2/portfile.cmake index 93e1ead79a6c22..267945d2046cb1 100644 --- a/ports/polyhook2/portfile.cmake +++ b/ports/polyhook2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "Linux" "OSX" "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stevemk14ebr/PolyHook_2_0 - REF d8d0eb9b0932783f7d6be2d96e4d2c8adbf08c4b - SHA512 4e08614818dac648596118c62c38b36f88b39bd7c299cdbb44604249b3d7201541dcb64e926e3f5a92327603342f8393e4c7c84feda37e9f4250a5bf06ab2473 + REF 69fa86df9ae125617ac660b2d6ae2920c69194d9 + SHA512 822c6f07106b5264ab0fe6608875e18ff85572e4316f9bf90be9c68a2c0ed2c4a8f1d1b9fd497d8adf8420c1c9cc34ff46f2e8848f128e37491a86212ed14dc9 HEAD_REF master ) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5546c1f1ae9aec..b51ca95fb92f59 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -74,8 +74,6 @@ asiosdk:x64-osx=fail asiosdk:x64-uwp=fail asiosdk:arm64-windows=fail asiosdk:arm-uwp=fail -asmjit:arm64-windows=fail -asmjit:arm-uwp=fail asyncplusplus:arm-uwp=fail asyncplusplus:x64-uwp=fail atk:x64-osx=fail @@ -1365,11 +1363,6 @@ pmdk:x64-windows-static=fail pmdk:x86-windows=fail pngwriter:arm-uwp=fail pngwriter:x64-uwp=fail -polyhook2:arm64-windows=fail -polyhook2:arm-uwp=fail -polyhook2:x64-linux=fail -polyhook2:x64-uwp=fail -polyhook2:x64-osx=fail portable-snippets:arm-uwp=fail # Portaudio was broken by Ninja 1.9.0 https://github.com/ninja-build/ninja/pull/1406 portaudio:arm-uwp=fail