diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index ef560fdd..2fc704ea 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -141,7 +141,7 @@ jobs: run: | cd build wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add - - sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-bionic.list http://packages.lunarg.com/vulkan/lunarg-vulkan-bionic.list + sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-focal.list http://packages.lunarg.com/vulkan/lunarg-vulkan-focal.list sudo apt-add-repository ppa:cginternals/ppa sudo apt-get update sudo apt-get install -y cmake ccache vulkan-sdk python3-setuptools mesa-common-dev libglu1-mesa-dev ninja-build libcurl4-openssl-dev libsdl2-dev libssl-dev zlib1g-dev libuv1-dev libc-ares-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e10277c..960a8de1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,12 +85,12 @@ if(VCPKG_TARGET_TRIPLET) find_package(CURL CONFIG REQUIRED) find_package(OpenSSL REQUIRED) find_package(SDL2 CONFIG REQUIRED) - find_package(unofficial-libuv CONFIG REQUIRED) + find_package(libuv CONFIG REQUIRED) find_package(ZLIB REQUIRED) set(CARES_LIBRARY c-ares::cares) set(CURL_LIBRARY CURL::libcurl) - set(LIBUV_LIBRARY unofficial::libuv::libuv) + set(LIBUV_LIBRARY libuv::uv) set(OPENSSL_LIBRARY OpenSSL::SSL) set(SDL2_LIBRARY SDL2::SDL2) set(SDL2_MAIN_LIBRARY SDL2::SDL2main) diff --git a/libraries/vcpkg b/libraries/vcpkg index a5d6d145..fe1e9f50 160000 --- a/libraries/vcpkg +++ b/libraries/vcpkg @@ -1 +1 @@ -Subproject commit a5d6d145164e82e67fbf91a4a30f98699d30de63 +Subproject commit fe1e9f508ee13ed3d0a7d318beac7efe1ec4f9d7 diff --git a/vcpkg.json b/vcpkg.json index d0b8544e..d1c80c25 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,7 @@ { "name": "decaf-emu", - "version-string": "0.1.0", + "version-string": "0.2.0", + "builtin-baseline": "06c79a9afa6f99f02f44d20df9e0848b2a56bf1b", "dependencies": [ { "name": "ffmpeg",