From 523ff9ff1cc46f811fc60136673e1ca2adbf84ff Mon Sep 17 00:00:00 2001
From: "U-RAYYAN-PC\\Rayyan" <68647953+WaluigiWare64@users.noreply.github.com>
Date: Wed, 22 Jul 2020 14:22:23 +0100
Subject: Add libzip dependency in the workflow files and to CMakeLists.txt

---
 .github/workflows/build-ubuntu-aarch64.yml | 2 +-
 .github/workflows/build-ubuntu.yml         | 2 +-
 .github/workflows/build-windows.yml        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build-ubuntu-aarch64.yml b/.github/workflows/build-ubuntu-aarch64.yml
index 6d0bfde..761bd6d 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 libzip:arm64 qtbase5-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..71c421b 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 libzip-dev qt5-default
     - 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 b8e8b04..709f1cd 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -25,7 +25,7 @@ jobs:
         7z x -y msys64.7z "-oC:\tools\"
         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,libzip,toolchain}"
     - name: Create build environment
       run: |
         New-Item -ItemType directory -Path ${{runner.workspace}}\melonDS\build
-- 
cgit v1.2.3


From fd4775c3ca6437dc3a7c77f38c3ade3aaf6605a8 Mon Sep 17 00:00:00 2001
From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com>
Date: Wed, 22 Jul 2020 15:37:30 +0100
Subject: Fix Ubuntu ARM64 libzip dependency

---
 .github/workflows/build-ubuntu-aarch64.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build-ubuntu-aarch64.yml b/.github/workflows/build-ubuntu-aarch64.yml
index 761bd6d..b948e3f 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 libzip:arm64 qtbase5-dev:arm64
+        && sudo apt-get install {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 libzip-dev:arm64 qtbase5-dev:arm64
     - name: Create build environment
       run: mkdir ${{runner.workspace}}/build
     - name: Configure
-- 
cgit v1.2.3


From 6b8738bb6041ea0ac88aa9c3ff04115c3210ddc7 Mon Sep 17 00:00:00 2001
From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com>
Date: Sat, 19 Dec 2020 17:51:23 +0000
Subject: Update workflow files

---
 .github/workflows/build-macos.yml   | 2 +-
 .github/workflows/build-windows.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index e2b942a..59fb4bc 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Install dependencies
       working-directory: ${{runner.workspace}}
       run: |
-        brew install cmake sdl2 qt5 libslirp
+        brew install cmake sdl2 qt5 libslirp libarchive
     - 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 610eb76..ed302a8 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,libslirp,libzip,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,libarchive,toolchain}"
     - name: Create build environment
       run: |
         New-Item -ItemType directory -Path ${{runner.workspace}}\melonDS\build
-- 
cgit v1.2.3