diff options
| author | swirl <swurl@swurl.xyz> | 2022-02-03 14:14:12 -0500 |
|---|---|---|
| committer | swirl <swurl@swurl.xyz> | 2022-02-03 14:14:12 -0500 |
| commit | 076efc4cb2586edbc11868bd93f48cfe03eb5a6d (patch) | |
| tree | c525883696e42d8b3e2253e1b2eb08d43883abc6 /launcher/minecraft | |
| parent | 2c62a34c2f47961e343b8aae37cd76ed7520593e (diff) | |
| parent | c4cb7ddc4f9c06006d585ba7ff7405ac0cfdbb3c (diff) | |
| download | PrismLauncher-076efc4cb2586edbc11868bd93f48cfe03eb5a6d.tar.gz PrismLauncher-076efc4cb2586edbc11868bd93f48cfe03eb5a6d.tar.bz2 PrismLauncher-076efc4cb2586edbc11868bd93f48cfe03eb5a6d.zip | |
Merge branch 'update-quazip' of git://github.com/Scrumplex/PolyMC into develop
Diffstat (limited to 'launcher/minecraft')
| -rw-r--r-- | launcher/minecraft/MinecraftLoadAndCheck.h | 2 | ||||
| -rw-r--r-- | launcher/minecraft/MinecraftUpdate.h | 2 | ||||
| -rw-r--r-- | launcher/minecraft/World.cpp | 6 | ||||
| -rw-r--r-- | launcher/minecraft/launch/ExtractNatives.cpp | 4 | ||||
| -rw-r--r-- | launcher/minecraft/mod/LocalModParseTask.cpp | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/launcher/minecraft/MinecraftLoadAndCheck.h b/launcher/minecraft/MinecraftLoadAndCheck.h index bfeae46b..d9af3ace 100644 --- a/launcher/minecraft/MinecraftLoadAndCheck.h +++ b/launcher/minecraft/MinecraftLoadAndCheck.h @@ -20,7 +20,7 @@ #include <QUrl> #include "tasks/Task.h" -#include <quazip.h> +#include <quazip/quazip.h> #include "QObjectPtr.h" diff --git a/launcher/minecraft/MinecraftUpdate.h b/launcher/minecraft/MinecraftUpdate.h index fadebff9..9ebef656 100644 --- a/launcher/minecraft/MinecraftUpdate.h +++ b/launcher/minecraft/MinecraftUpdate.h @@ -22,7 +22,7 @@ #include "net/NetJob.h" #include "tasks/Task.h" #include "minecraft/VersionFilterData.h" -#include <quazip.h> +#include <quazip/quazip.h> class MinecraftVersion; class MinecraftInstance; diff --git a/launcher/minecraft/World.cpp b/launcher/minecraft/World.cpp index a2b4dac7..2937c116 100644 --- a/launcher/minecraft/World.cpp +++ b/launcher/minecraft/World.cpp @@ -26,9 +26,9 @@ #include <io/stream_reader.h> #include <tag_string.h> #include <tag_primitive.h> -#include <quazip.h> -#include <quazipfile.h> -#include <quazipdir.h> +#include <quazip/quazip.h> +#include <quazip/quazipfile.h> +#include <quazip/quazipdir.h> #include <QCoreApplication> diff --git a/launcher/minecraft/launch/ExtractNatives.cpp b/launcher/minecraft/launch/ExtractNatives.cpp index 8cd439b1..7d5f4179 100644 --- a/launcher/minecraft/launch/ExtractNatives.cpp +++ b/launcher/minecraft/launch/ExtractNatives.cpp @@ -17,8 +17,8 @@ #include <minecraft/MinecraftInstance.h> #include <launch/LaunchTask.h> -#include <quazip.h> -#include <quazipdir.h> +#include <quazip/quazip.h> +#include <quazip/quazipdir.h> #include "MMCZip.h" #include "FileSystem.h" #include <QDir> diff --git a/launcher/minecraft/mod/LocalModParseTask.cpp b/launcher/minecraft/mod/LocalModParseTask.cpp index 8ac5885f..757a2187 100644 --- a/launcher/minecraft/mod/LocalModParseTask.cpp +++ b/launcher/minecraft/mod/LocalModParseTask.cpp @@ -4,8 +4,8 @@ #include <QJsonObject> #include <QJsonArray> #include <QJsonValue> -#include <quazip.h> -#include <quazipfile.h> +#include <quazip/quazip.h> +#include <quazip/quazipfile.h> #include <toml.h> #include "settings/INIFile.h" |