aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNadia Holmquist Pedersen <nadia@nhp.sh>2020-07-26 21:43:01 +0200
committerNadia Holmquist Pedersen <nadia@nhp.sh>2020-07-26 21:43:01 +0200
commit8a1964a75cf4cf89d373c7bba5116abc1d48b549 (patch)
treef8882972a75971bd41f7228718fea61f33daa082
parentb4ad35948d864cbbb8e1759fbbc913870293160e (diff)
Add libslirp to workflows
-rw-r--r--.github/workflows/build-ubuntu-aarch64.yml2
-rw-r--r--.github/workflows/build-ubuntu.yml2
-rw-r--r--.github/workflows/build-windows.yml2
3 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/build-ubuntu-aarch64.yml b/.github/workflows/build-ubuntu-aarch64.yml
index 6d0bfde..c242c57 100644
--- a/.github/workflows/build-ubuntu-aarch64.yml
+++ b/.github/workflows/build-ubuntu-aarch64.yml
@@ -26,7 +26,7 @@ jobs:
&& sudo rm /etc/apt/sources.list \
&& sudo mv /etc/apt/sources.list{.new,} \
&& sudo apt-get update \
- && sudo apt-get install {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 qtbase5-dev:arm64
+ && sudo apt-get install {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 qtbase5-dev:arm64 libslirp-dev:arm64
- name: Create build environment
run: mkdir ${{runner.workspace}}/build
- name: Configure
diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
index 4ecdae0..4483483 100644
--- a/.github/workflows/build-ubuntu.yml
+++ b/.github/workflows/build-ubuntu.yml
@@ -27,7 +27,7 @@ jobs:
&& tar -zxf cmake-$CMAKE_VERSION-Linux-x86_64.tar.gz \
&& sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list \
&& sudo apt-get update \
- && sudo apt-get install gtk+-3.0 libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default
+ && sudo apt-get install gtk+-3.0 libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default libslirp-dev
- name: Create build environment
run: mkdir ${{runner.workspace}}/build
- name: Configure
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 035bc54..bbf68af 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -24,7 +24,7 @@ jobs:
choco install msys2
C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Syuq --noconfirm"
- name: Install dependencies
- run: C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sq --noconfirm git make mingw-w64-x86_64-{cmake,mesa,SDL2,qt5-static,toolchain}"
+ run: C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sq --noconfirm git make mingw-w64-x86_64-{cmake,mesa,SDL2,qt5-static,libslirp,toolchain}"
- name: Create build environment
run: |
New-Item -ItemType directory -Path ${{runner.workspace}}\melonDS\build