Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop

Conflicts:
	CMakeLists.txt
	gui/MainWindow.cpp

1 files changed, 28 insertions, 0 deletions

diff --git a/mmc_updater/src/UpdaterOptions.h b/mmc_updater/src/UpdaterOptions.h
new file mode 100644
index 00000000..b4473a82
--- /dev/null
+++ b/mmc_updater/src/UpdaterOptions.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "UpdateInstaller.h"
+
+/** Parses the command-line options to the updater binary. */
+class UpdaterOptions
+{
+	public:
+		UpdaterOptions();
+
+		void parse(int argc, char** argv);
+
+		UpdateInstaller::Mode mode;
+		std::string installDir;
+		std::string packageDir;
+		std::string scriptPath;
+		std::string finishCmd;
+		PLATFORM_PID waitPid;
+		std::string logFile;
+		bool showVersion;
+		bool forceElevated;
+		bool autoClose;
+
+	private:
+		void parseOldFormatArgs(int argc, char** argv);
+		static void parseOldFormatArg(const std::string& arg, std::string* key, std::string* value);
+};
+