From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 10 Oct 2014 19:59:42 +0000 (+0300)
Subject: Move OS X main function to an overlay
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=e9606fcfd202207a029fff31f03b8e1a7a0d2963;p=libs%2Fcore.git

Move OS X main function to an overlay
---

diff --git a/Build b/Build
index 2aa78db..aea04a1 100644
--- a/Build
+++ b/Build
@@ -38,6 +38,10 @@ package "mspcore"
 		{
 			overlay "windows";
 		};
+		if_arch "darwin"
+		{
+			overlay "osx";
+		};
 		if_arch "!windows"
 		{
 			overlay "unix";
diff --git a/source/core/osx/main.cpp b/source/core/osx/main.cpp
new file mode 100644
index 0000000..e9a6fe2
--- /dev/null
+++ b/source/core/osx/main.cpp
@@ -0,0 +1,23 @@
+#include <cstring>
+#include "application.h"
+
+int main(int argc, char **argv)
+{
+	void *data = 0;
+
+	/* 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;
+
+	return Msp::Application::run(argc, argv, data);
+}
diff --git a/source/core/unix/main.cpp b/source/core/unix/main.cpp
index e7f4c3c..434dba1 100644
--- a/source/core/unix/main.cpp
+++ b/source/core/unix/main.cpp
@@ -1,25 +1,6 @@
-#include <cstring>
 #include "application.h"
 
 int main(int argc, char **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);
+	return Msp::Application::run(argc, argv, 0);
 }