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/minecraft | |
| parent | efa414c442a77735a5f972b7103e8ce866a6bdd1 (diff) | |
| download | PrismLauncher-3aa809b8c0de48ca241ec567acda31ed1a728540.tar.gz PrismLauncher-3aa809b8c0de48ca241ec567acda31ed1a728540.tar.bz2 PrismLauncher-3aa809b8c0de48ca241ec567acda31ed1a728540.zip | |
refactor: add in-tree QuaZip
Diffstat (limited to 'launcher/minecraft')
| -rw-r--r-- | launcher/minecraft/MinecraftLoadAndCheck.h | 5 | ||||
| -rw-r--r-- | launcher/minecraft/MinecraftUpdate.h | 5 | ||||
| -rw-r--r-- | launcher/minecraft/World.cpp | 7 | ||||
| -rw-r--r-- | launcher/minecraft/launch/ExtractNatives.cpp | 6 | ||||
| -rw-r--r-- | launcher/minecraft/mod/LocalModParseTask.cpp | 7 |
5 files changed, 30 insertions, 0 deletions
diff --git a/launcher/minecraft/MinecraftLoadAndCheck.h b/launcher/minecraft/MinecraftLoadAndCheck.h index 4e673a4b..1aeb79f8 100644 --- a/launcher/minecraft/MinecraftLoadAndCheck.h +++ b/launcher/minecraft/MinecraftLoadAndCheck.h @@ -20,7 +20,12 @@ #include <QUrl> #include "tasks/Task.h" + +#ifdef QUAZIP_USE_SUBMODULE +#include <quazip/quazip.h> +#else #include <QuaZip-Qt5-1.2/quazip/quazip.h> +#endif #include "QObjectPtr.h" diff --git a/launcher/minecraft/MinecraftUpdate.h b/launcher/minecraft/MinecraftUpdate.h index a1df4b3f..36c4310b 100644 --- a/launcher/minecraft/MinecraftUpdate.h +++ b/launcher/minecraft/MinecraftUpdate.h @@ -22,7 +22,12 @@ #include "net/NetJob.h" #include "tasks/Task.h" #include "minecraft/VersionFilterData.h" + +#ifdef QUAZIP_USE_SUBMODULE +#include <quazip/quazip.h> +#else #include <QuaZip-Qt5-1.2/quazip/quazip.h> +#endif class MinecraftVersion; class MinecraftInstance; diff --git a/launcher/minecraft/World.cpp b/launcher/minecraft/World.cpp index 95892d43..8fd77919 100644 --- a/launcher/minecraft/World.cpp +++ b/launcher/minecraft/World.cpp @@ -26,9 +26,16 @@ #include <io/stream_reader.h> #include <tag_string.h> #include <tag_primitive.h> + +#ifdef QUAZIP_USE_SUBMODULE +#include <quazip/quazip.h> +#include <quazip/quazipfile.h> +#include <quazip/quazipdir.h> +#else #include <QuaZip-Qt5-1.2/quazip/quazip.h> #include <QuaZip-Qt5-1.2/quazip/quazipfile.h> #include <QuaZip-Qt5-1.2/quazip/quazipdir.h> +#endif #include <QCoreApplication> diff --git a/launcher/minecraft/launch/ExtractNatives.cpp b/launcher/minecraft/launch/ExtractNatives.cpp index 744e7ac6..5f13f730 100644 --- a/launcher/minecraft/launch/ExtractNatives.cpp +++ b/launcher/minecraft/launch/ExtractNatives.cpp @@ -17,8 +17,14 @@ #include <minecraft/MinecraftInstance.h> #include <launch/LaunchTask.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 "MMCZip.h" #include "FileSystem.h" #include <QDir> diff --git a/launcher/minecraft/mod/LocalModParseTask.cpp b/launcher/minecraft/mod/LocalModParseTask.cpp index fa3a4538..651b96ac 100644 --- a/launcher/minecraft/mod/LocalModParseTask.cpp +++ b/launcher/minecraft/mod/LocalModParseTask.cpp @@ -4,8 +4,15 @@ #include <QJsonObject> #include <QJsonArray> #include <QJsonValue> + +#ifdef QUAZIP_USE_SUBMODULE +#include <quazip/quazip.h> +#include <quazip/quazipfile.h> +#else #include <QuaZip-Qt5-1.2/quazip/quazip.h> #include <QuaZip-Qt5-1.2/quazip/quazipfile.h> +#endif + #include <toml.h> #include "settings/INIFile.h" |