X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcore%2Funix%2Fmain.cpp;h=e7f4c3ce10b998ae4b0e3b99197807db6be08a85;hb=b4664bc8a51e2b78e9325feecc196a426ac4fc38;hp=601ddb6f998ee0ac188f0113e5687e78a56fc018;hpb=609c9a508cfdc7b42c46c4f21d17639204165a00;p=libs%2Fcore.git

diff --git a/source/core/unix/main.cpp b/source/core/unix/main.cpp
index 601ddb6..e7f4c3c 100644
--- a/source/core/unix/main.cpp
+++ b/source/core/unix/main.cpp
@@ -1,6 +1,25 @@
+#include <cstring>
 #include "application.h"
 
 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);
 }