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

move libarchive outside bundle libs

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

7
CMakeLists.txt
View File

@ -337,12 +337,13 @@ if(Launcher_QT_VERSION_MAJOR EQUAL 6)
set(QT_LIBEXECS_DIR ${QT${QT_VERSION_MAJOR}_INSTALL_PREFIX}/${QT${QT_VERSION_MAJOR}_INSTALL_LIBEXECS}) set(QT_LIBEXECS_DIR ${QT${QT_VERSION_MAJOR}_INSTALL_PREFIX}/${QT${QT_VERSION_MAJOR}_INSTALL_LIBEXECS})
endif() endif()
find_package(PkgConfig REQUIRED)
pkg_check_modules(libarchive REQUIRED IMPORTED_TARGET libarchive)
if(NOT Launcher_FORCE_BUNDLED_LIBS) if(NOT Launcher_FORCE_BUNDLED_LIBS)
find_package(PkgConfig REQUIRED)
pkg_check_modules(libarchive IMPORTED_TARGET libarchive)
# Find toml++ # Find toml++
find_package(tomlplusplus 3.2.0 QUIET) find_package(tomlplusplus 3.2.0 QUIET)
# Fallback to pkg-config (if available) if CMake files aren't found # Fallback to pkg-config if CMake files aren't found
if(NOT tomlplusplus_FOUND) if(NOT tomlplusplus_FOUND)
pkg_check_modules(tomlplusplus IMPORTED_TARGET tomlplusplus>=3.2.0) pkg_check_modules(tomlplusplus IMPORTED_TARGET tomlplusplus>=3.2.0)
endif() endif()

2
launcher/minecraft/mod/Mod.h
View File

@ -44,8 +44,6 @@
#include <QPixmap> #include <QPixmap>
#include <QPixmapCache> #include <QPixmapCache>
#include <optional>
#include "ModDetails.h" #include "ModDetails.h"
#include "Resource.h" #include "Resource.h"

4
launcher/minecraft/mod/ModDetails.h
View File

@ -35,14 +35,10 @@
#pragma once #pragma once
#include <memory>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QUrl> #include <QUrl>
#include "minecraft/mod/MetadataHandler.h"
struct ModLicense { struct ModLicense {
QString name = {}; QString name = {};
QString id = {}; QString id = {};

1
launcher/modplatform/flame/FlamePackExportTask.cpp
View File

@ -30,7 +30,6 @@
#include <memory> #include <memory>
#include "Application.h" #include "Application.h"
#include "Json.h" #include "Json.h"
#include "MMCZip.h"
#include "archive/ExportToZipTask.h" #include "archive/ExportToZipTask.h"
#include "minecraft/PackProfile.h" #include "minecraft/PackProfile.h"
#include "minecraft/mod/ModFolderModel.h" #include "minecraft/mod/ModFolderModel.h"