|
48 | 48 |
|
49 | 49 | - name: Install Linux dependencies |
50 | 50 | if: matrix.os == 'ubuntu' |
51 | | - run: sudo apt-get update -y && sudo apt-get install -y libpcap-dev libasound2-dev libgtk-3-dev |
| 51 | + run: sudo apt-get update -y && sudo apt-get install -y libpcap-dev libasound2-dev |
52 | 52 |
|
53 | 53 | - name: Install Windows dependencies |
54 | 54 | if: matrix.os == 'windows' |
|
58 | 58 | run: | |
59 | 59 | Write-Host "::group::Npcap SDK" |
60 | 60 | $ARCH = "${{ matrix.arch }}" |
61 | | - Invoke-WebRequest -Uri "https://npcap.com/dist/npcap-sdk-1.13.zip" -OutFile "$env:TEMP\npcap-sdk.zip" -Verbose |
| 61 | + Invoke-WebRequest -Uri "https://npcap.com/dist/npcap-sdk-1.16.zip" -OutFile "$env:TEMP\npcap-sdk.zip" -Verbose |
62 | 62 | Expand-Archive -LiteralPath "$env:TEMP\npcap-sdk.zip" -DestinationPath "$env:TEMP\npcap-sdk" -Verbose |
63 | 63 | $LibPath = switch ($ARCH) |
64 | 64 | { |
@@ -103,7 +103,18 @@ jobs: |
103 | 103 |
|
104 | 104 | - name: Build binary (Linux) |
105 | 105 | if: matrix.os == 'ubuntu' |
106 | | - run: cross build --release --target ${{ matrix.target }} |
| 106 | + # alsa-sys and fontconfig-sys use pkg-config to locate their C libs, but the 0.2.5 |
| 107 | + # cross image doesn't pre-configure pkg-config for cross-compilation: point it at the |
| 108 | + # target arch's .pc files (installed by the Cross.toml pre-build) and allow cross lookups |
| 109 | + env: |
| 110 | + PKG_CONFIG_ALLOW_CROSS: "1" |
| 111 | + run: | |
| 112 | + case "${{ matrix.arch }}" in |
| 113 | + i386) export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ;; |
| 114 | + armhf) export PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig ;; |
| 115 | + arm64) export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig ;; |
| 116 | + esac |
| 117 | + cross build --release --target ${{ matrix.target }} |
107 | 118 |
|
108 | 119 | - name: Build binary (macOS/Windows) |
109 | 120 | if: matrix.os == 'macos' || matrix.os == 'windows' |
|
0 commit comments