VCPKG

4JX · Sep 19, 2024 · 494145c · 494145c
1 parent 649ec7c
commit 494145c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/compile-rust.yml b/.github/workflows/compile-rust.yml
@@ -21,13 +21,13 @@ jobs:
             artifact_name: target/debug/legion-kb-rgb
             asset_name: legion-kb-rgb-linux
             triplet: x64-linux
-            vcpkgCommitId: 'f6a5d4e8eb7476b8d7fc12a56dff300c1c986131'
+            vcpkgCommitId: 'ab67d6306b5e9af69684af5ec761c97731e75834'
           - name: windows
             os: windows-latest
             artifact_name: target/debug/legion-kb-rgb.exe
             asset_name: legion-kb-rgb-windows
             triplet: x64-windows-static
-            vcpkgCommitId: 'f6a5d4e8eb7476b8d7fc12a56dff300c1c986131'
+            vcpkgCommitId: 'ab67d6306b5e9af69684af5ec761c97731e75834'
 
     env:
       VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }}
@@ -55,6 +55,7 @@ jobs:
           if [ "$RUNNER_OS" == "Linux" ]; then
            sudo apt-get update -y
            sudo apt install -y libunwind-dev
+           sudo apt install -y libvpx-dev libyuv-dev libaom-dev
            sudo apt-get install -y libx11-dev nasm libdbus-1-dev libudev-dev libxcb-randr0-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libxi-dev libxtst-dev libusb-1.0-0-dev
           elif [ "$RUNNER_OS" == "macOS" ]; then
            brew install nasm
@@ -66,6 +67,7 @@ jobs:
       - name: Set up VCPKG deps
         uses: lukka/run-vcpkg@v11
         id: runvcpkg
+        if: ${{ runner.os != 'Linux' }}
         with:
           vcpkgGitCommitId: '${{ matrix.vcpkgCommitId }}'
           # Run vcpkg with the command specified by the `runVcpkgFormatString` input.

diff --git a/.github/workflows/release-rust.yml b/.github/workflows/release-rust.yml
@@ -21,13 +21,13 @@ jobs:
             artifact_name: target/release/legion-kb-rgb
             asset_name: legion-kb-rgb-linux
             triplet: x64-linux
-            vcpkgCommitId: 'f6a5d4e8eb7476b8d7fc12a56dff300c1c986131'
+            vcpkgCommitId: 'ab67d6306b5e9af69684af5ec761c97731e75834'
           - name: windows
             os: windows-latest
             artifact_name: target/release/legion-kb-rgb.exe
             asset_name: legion-kb-rgb-windows
             triplet: x64-windows-static
-            vcpkgCommitId: 'f6a5d4e8eb7476b8d7fc12a56dff300c1c986131'
+            vcpkgCommitId: 'ab67d6306b5e9af69684af5ec761c97731e75834'
 
     env:
       VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }}

diff --git a/vcpkg.json b/vcpkg.json
@@ -1,5 +1,5 @@
 {
 	"name": "l5p-kb-rgb",
 	"version-string": "0.1.0",
-	"dependencies": ["libvpx", "libyuv"]
+	"dependencies": ["libvpx", "libyuv", "aom"]
 }