AstralTransRocketries/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-08-03 19:37:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

add libarchive as actions dependency

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2025-07-11 22:51:12 +03:00
parent a0dc1db285
commit e651b6698c
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/setup-dependencies/linux/action.yml vendored
View File

@ -9,7 +9,7 @@ runs:
run: | run: |
sudo apt-get -y update sudo apt-get -y update
sudo apt-get -y install \ sudo apt-get -y install \
dpkg-dev \ dpkg-dev libarchive-dev \
ninja-build extra-cmake-modules scdoc \ ninja-build extra-cmake-modules scdoc \
appstream libxcb-cursor-dev appstream libxcb-cursor-dev

2
.github/actions/setup-dependencies/macos/action.yml vendored
View File

@ -14,7 +14,7 @@ runs:
shell: bash shell: bash
run: | run: |
brew update brew update
brew install ninja extra-cmake-modules temurin@17 brew install ninja extra-cmake-modules temurin@17 libarchive
- name: Set JAVA_HOME - name: Set JAVA_HOME
shell: bash shell: bash

5
launcher/CMakeLists.txt
View File

@ -639,6 +639,10 @@ set(PRISMUPDATER_SOURCES
# Zip # Zip
MMCZip.h MMCZip.h
MMCZip.cpp MMCZip.cpp
archive/ArchiveReader.cpp
archive/ArchiveReader.h
archive/ArchiveWriter.cpp
archive/ArchiveWriter.h
# Time # Time
MMCTime.h MMCTime.h
@ -1429,6 +1433,7 @@ if(Launcher_BUILD_UPDATER)
Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Network
${Launcher_QT_LIBS} ${Launcher_QT_LIBS}
cmark::cmark cmark::cmark
PkgConfig::libarchive
) )
add_executable("${Launcher_Name}_updater" WIN32 updater/prismupdater/updater_main.cpp) add_executable("${Launcher_Name}_updater" WIN32 updater/prismupdater/updater_main.cpp)

6
launcher/MMCZip.cpp
View File

@ -38,6 +38,7 @@
#include <archive.h> #include <archive.h>
#include "FileSystem.h" #include "FileSystem.h"
#include "archive/ArchiveReader.h" #include "archive/ArchiveReader.h"
#include "archive/ArchiveWriter.h"
#include <QCoreApplication> #include <QCoreApplication>
#include <QDebug> #include <QDebug>
@ -45,11 +46,6 @@
#include <QUrl> #include <QUrl>
#include <memory> #include <memory>
#if defined(LAUNCHER_APPLICATION)
#include <QtConcurrentRun>
#include "archive/ArchiveWriter.h"
#endif
namespace MMCZip { namespace MMCZip {
// ours // ours
using FilterFunction = std::function<bool(const QString&)>; using FilterFunction = std::function<bool(const QString&)>;