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

Conflicts:
	CMakeLists.txt
	gui/MainWindow.cpp

1 files changed, 18 insertions, 0 deletions

diff --git a/mmc_updater/src/StandardDirs.mm b/mmc_updater/src/StandardDirs.mm
new file mode 100644
index 00000000..53eecd47
--- /dev/null
+++ b/mmc_updater/src/StandardDirs.mm
@@ -0,0 +1,18 @@
+#include <Foundation/Foundation.h>
+
+#include "StandardDirs.h"
+
+std::string StandardDirs::applicationSupportFolderPath()
+{
+	NSArray* paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory,
+	                   NSUserDomainMask,
+	                   true /* expand tildes */);
+
+	for (unsigned int i=0; i < [paths count]; i++)
+	{
+		NSString* path = [paths objectAtIndex:i];
+		return std::string([path UTF8String]);
+	}
+	return std::string();
+}
+