From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 4 Oct 2013 21:44:41 +0000 (+0300)
Subject: OS X tweaks
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=caa878f5426d5d1dbcbe6c3b78656c3618411e7b;p=libs%2Fcore.git

OS X tweaks
---

diff --git a/source/core/unix/main.cpp b/source/core/unix/main.cpp
index 601ddb6..698ec69 100644
--- a/source/core/unix/main.cpp
+++ b/source/core/unix/main.cpp
@@ -2,5 +2,23 @@
 
 int main(int argc, char **argv)
 {
-	return Msp::Application::run(argc, argv);
+	void *data = 0;
+
+#ifdef __APPLE__
+	/* Applications launched from Finder get a special argument, which would
+	interfere with GetOpt.  Remove it from argv but pass it as data so it can
+	be used to determine how the application was launhed. */
+	int j = 0;
+	for(int i=0; i<argc; ++i)
+	{
+		if(!strncmp(argv[i], "-psn_", 5))
+			data = argv[i];
+		else
+			argv[j++] = argv[i];
+	}
+	argc = j;
+	argv[j] = 0;
+#endif
+
+	return Msp::Application::run(argc, argv, data);
 }
diff --git a/source/fs/dir.cpp b/source/fs/dir.cpp
index 57fd936..f775847 100644
--- a/source/fs/dir.cpp
+++ b/source/fs/dir.cpp
@@ -146,6 +146,8 @@ Path get_sys_data_dir(const string &argv0, const string &appname)
 
 	if(dir[-1]=="bin" || dir[-1]=="sbin")
 		return dir/".."/"share"/appname;
+	else if(dir[-1]=="MacOS")
+		return dir/".."/"Resources";
 	else
 		return dir;
 }