diff --git a/.github/actions/setup-dependencies/linux/action.yml b/.github/actions/setup-dependencies/linux/action.yml index 94c04abe5..033646d94 100644 --- a/.github/actions/setup-dependencies/linux/action.yml +++ b/.github/actions/setup-dependencies/linux/action.yml @@ -9,7 +9,7 @@ runs: run: | sudo apt-get -y update sudo apt-get -y install \ - dpkg-dev \ + dpkg-dev libarchive-dev \ ninja-build extra-cmake-modules scdoc \ appstream libxcb-cursor-dev diff --git a/.github/actions/setup-dependencies/macos/action.yml b/.github/actions/setup-dependencies/macos/action.yml index 6fc3ed3bf..82c0a69c4 100644 --- a/.github/actions/setup-dependencies/macos/action.yml +++ b/.github/actions/setup-dependencies/macos/action.yml @@ -14,7 +14,7 @@ runs: shell: bash run: | brew update - brew install ninja extra-cmake-modules temurin@17 + brew install ninja extra-cmake-modules temurin@17 libarchive - name: Set JAVA_HOME shell: bash diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 6b4b4dcd3..76a153f04 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -639,6 +639,10 @@ set(PRISMUPDATER_SOURCES # Zip MMCZip.h MMCZip.cpp + archive/ArchiveReader.cpp + archive/ArchiveReader.h + archive/ArchiveWriter.cpp + archive/ArchiveWriter.h # Time MMCTime.h @@ -1429,6 +1433,7 @@ if(Launcher_BUILD_UPDATER) Qt${QT_VERSION_MAJOR}::Network ${Launcher_QT_LIBS} cmark::cmark + PkgConfig::libarchive ) add_executable("${Launcher_Name}_updater" WIN32 updater/prismupdater/updater_main.cpp) diff --git a/launcher/MMCZip.cpp b/launcher/MMCZip.cpp index 1c7818301..8e4e433ed 100644 --- a/launcher/MMCZip.cpp +++ b/launcher/MMCZip.cpp @@ -38,6 +38,7 @@ #include #include "FileSystem.h" #include "archive/ArchiveReader.h" +#include "archive/ArchiveWriter.h" #include #include @@ -45,11 +46,6 @@ #include #include -#if defined(LAUNCHER_APPLICATION) -#include -#include "archive/ArchiveWriter.h" -#endif - namespace MMCZip { // ours using FilterFunction = std::function;