diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-01-24 22:55:57 +0100 |
|---|---|---|
| committer | Sefa Eyeoglu <contact@scrumplex.net> | 2022-01-31 21:40:59 +0100 |
| commit | 3aa809b8c0de48ca241ec567acda31ed1a728540 (patch) | |
| tree | a5adefed46bd2ea7fda742d0b5be160f3e1c0f02 /launcher/modplatform | |
| parent | efa414c442a77735a5f972b7103e8ce866a6bdd1 (diff) | |
| download | PrismLauncher-3aa809b8c0de48ca241ec567acda31ed1a728540.tar.gz PrismLauncher-3aa809b8c0de48ca241ec567acda31ed1a728540.tar.bz2 PrismLauncher-3aa809b8c0de48ca241ec567acda31ed1a728540.zip | |
refactor: add in-tree QuaZip
Diffstat (limited to 'launcher/modplatform')
4 files changed, 23 insertions, 0 deletions
diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp index 30a61026..c4f4b96f 100644 --- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp +++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp @@ -19,7 +19,11 @@ #include <QtConcurrent/QtConcurrent> +#ifdef QUAZIP_USE_SUBMODULE +#include <quazip/quazip.h> +#else #include <QuaZip-Qt5-1.2/quazip/quazip.h> +#endif #include "MMCZip.h" #include "minecraft/OneSixVersionFormat.h" diff --git a/launcher/modplatform/legacy_ftb/PackInstallTask.h b/launcher/modplatform/legacy_ftb/PackInstallTask.h index 6797971c..2cdfee7a 100644 --- a/launcher/modplatform/legacy_ftb/PackInstallTask.h +++ b/launcher/modplatform/legacy_ftb/PackInstallTask.h @@ -1,8 +1,15 @@ #pragma once #include "InstanceTask.h" #include "net/NetJob.h" + +#ifdef QUAZIP_USE_SUBMODULE +#include <quazip/quazip.h> +#include <quazip/quazipdir.h> +#else #include "QuaZip-Qt5-1.2/quazip/quazip.h" #include "QuaZip-Qt5-1.2/quazip/quazipdir.h" +#endif + #include "meta/Index.h" #include "meta/Version.h" #include "meta/VersionList.h" diff --git a/launcher/modplatform/technic/SingleZipPackInstallTask.h b/launcher/modplatform/technic/SingleZipPackInstallTask.h index 58594136..d3bdc00b 100644 --- a/launcher/modplatform/technic/SingleZipPackInstallTask.h +++ b/launcher/modplatform/technic/SingleZipPackInstallTask.h @@ -18,7 +18,11 @@ #include "InstanceTask.h" #include "net/NetJob.h" +#ifdef QUAZIP_USE_SUBMODULE +#include <quazip/quazip.h> +#else #include "QuaZip-Qt5-1.2/quazip/quazip.h" +#endif #include <QFutureWatcher> #include <QStringList> diff --git a/launcher/modplatform/technic/TechnicPackProcessor.cpp b/launcher/modplatform/technic/TechnicPackProcessor.cpp index f5c011f5..a8b4d05b 100644 --- a/launcher/modplatform/technic/TechnicPackProcessor.cpp +++ b/launcher/modplatform/technic/TechnicPackProcessor.cpp @@ -19,9 +19,17 @@ #include <Json.h> #include <minecraft/MinecraftInstance.h> #include <minecraft/PackProfile.h> + +#ifdef QUAZIP_USE_SUBMODULE +#include <quazip/quazip.h> +#include <quazip/quazipdir.h> +#include <quazip/quazipfile.h> +#else #include <QuaZip-Qt5-1.2/quazip/quazip.h> #include <QuaZip-Qt5-1.2/quazip/quazipdir.h> #include <QuaZip-Qt5-1.2/quazip/quazipfile.h> +#endif + #include <settings/INISettingsObject.h> #include <memory> |