mirror of
https://github.com/decaf-emu/decaf-emu.git
synced 2024-05-13 02:04:56 -04:00
CI fix
This commit is contained in:
parent
a0f9d66703
commit
eb146c53a0
2
.github/workflows/ccpp.yml
vendored
2
.github/workflows/ccpp.yml
vendored
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit a5d6d145164e82e67fbf91a4a30f98699d30de63
|
||||
Subproject commit fe1e9f508ee13ed3d0a7d318beac7efe1ec4f9d7
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"name": "decaf-emu",
|
||||
"version-string": "0.1.0",
|
||||
"version-string": "0.2.0",
|
||||
"builtin-baseline": "06c79a9afa6f99f02f44d20df9e0848b2a56bf1b",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "ffmpeg",
|
||||
|
|
Loading…
Reference in a new issue