diff options
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, 0 insertions, 30 deletions
diff --git a/launcher/minecraft/MinecraftLoadAndCheck.h b/launcher/minecraft/MinecraftLoadAndCheck.h index 1aeb79f8..d9af3ace 100644 --- a/launcher/minecraft/MinecraftLoadAndCheck.h +++ b/launcher/minecraft/MinecraftLoadAndCheck.h @@ -20,12 +20,7 @@ #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 36c4310b..9ebef656 100644 --- a/launcher/minecraft/MinecraftUpdate.h +++ b/launcher/minecraft/MinecraftUpdate.h @@ -22,12 +22,7 @@ #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 8fd77919..2937c116 100644 --- a/launcher/minecraft/World.cpp +++ b/launcher/minecraft/World.cpp @@ -26,16 +26,9 @@ #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 5f13f730..7d5f4179 100644 --- a/launcher/minecraft/launch/ExtractNatives.cpp +++ b/launcher/minecraft/launch/ExtractNatives.cpp @@ -17,14 +17,8 @@ #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 651b96ac..757a2187 100644 --- a/launcher/minecraft/mod/LocalModParseTask.cpp +++ b/launcher/minecraft/mod/LocalModParseTask.cpp @@ -4,15 +4,8 @@ #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" |