Moved config file to Application Support folder for Mac

kroyee · Sep 9, 2017 · 1ad881e · 1ad881e
1 parent c982857
commit 1ad881e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/src/resources/ResourcePath.hpp b/src/resources/ResourcePath.hpp
@@ -39,5 +39,6 @@
 ///
 ////////////////////////////////////////////////////////////
 std::string resourcePath(void);
+std::string applicationSupportFolder(void);
 
 #endif
diff --git a/src/resources/ResourcePath.mm b/src/resources/ResourcePath.mm
@@ -49,4 +49,25 @@
     [pool drain];
 
     return rpath;
-}
+}
+
+std::string applicationSupportFolder(void) {
+    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+
+    NSFileManager* sharedFM = [NSFileManager defaultManager];
+    NSArray* possibleURLs = [sharedFM URLsForDirectory:NSApplicationSupportDirectory
+                                             inDomains:NSUserDomainMask];
+    NSURL* appSupportDir = nil;
+
+    if ([possibleURLs count] >= 1) {
+        // Use the first directory (if multiple are returned)
+        appSupportDir = [possibleURLs objectAtIndex:0];
+    }
+    NSString* path = [NSString stringWithFormat:@"%@%@", appSupportDir.absoluteString, @"SpeedBlocks/"];
+    std::string dir = [path UTF8String];
+    dir.replace(dir.find("%20"), 3, " ");
+    dir.erase(0,7);
+
+    [pool drain];
+    return dir;
+}
diff --git a/src/resources/optionSet.cpp b/src/resources/optionSet.cpp
@@ -11,13 +11,12 @@ using std::ofstream;
 
 #ifdef __APPLE__
 #include "ResourcePath.hpp"
+#include <sys/types.h>
+#include <sys/stat.h>
 #elif __WIN32
-#include "EmptyResourcePath.h"
 #include <windows.h>
 #include <shlobj.h>
 #include <stdlib.h>
-#else
-#include "EmptyResourcePath.h"
 #endif
 
 
@@ -108,8 +107,10 @@ void optionSet::loadOptions() {
 	CoTaskMemFree(appdataW);
 
 	ifstream file (appdataFolder + "options.cfg");
+	#elif __APPLE__
+	ifstream file (applicationSupportFolder() + "options.cfg");
 	#else
-	ifstream file (resourcePath() + "options.cfg");
+	ifstream file ("options.cfg");
 	#endif
 
 	int countset = 0;
@@ -199,8 +200,11 @@ void optionSet::saveOptions() {
 	CoTaskMemFree(appdataW);
 
 	ofstream file(appdataFolder + "options.cfg");
+	#elif __APPLE__
+	mkdir(applicationSupportFolder().c_str(), 0755);
+	ifstream file (applicationSupportFolder() + "options.cfg");
 	#else
-	ofstream file(resourcePath() + "options.cfg");
+	ofstream file("options.cfg");
 	#endif
     sf::Color col;