fixed data dir detection on macos

bam.lua

@@ -160,6 +160,7 @@ function GenerateMacOSXSettings(settings, conf, arch, compiler)
 	settings.link.frameworks:Add("AGL")
 	-- FIXME: the SDL config is applied in BuildClient too but is needed here before so the launcher will compile
 	config.sdl:Apply(settings)
+	settings.link.extrafiles:Merge(Compile(settings, "src/osxlaunch/client.m"))
 	BuildClient(settings)
 
 	-- Content

src/engine/client/client.cpp

@@ -2443,9 +2443,14 @@ void CClient::HandleTeeworldsConnectLink(const char *pConLink)
 	Prediction Latency
 		Upstream latency
 */
-
+#if defined(CONF_PLATFORM_MACOSX)
+extern "C" int SDL_main(int argc, char **argv_) // ignore_convention
+{
+	const char **argv = const_cast<const char **>(argv_);
+#else
 int main(int argc, const char **argv) // ignore_convention
 {
+#endif
 #if defined(CONF_FAMILY_WINDOWS)
 	#ifdef CONF_RELEASE
 	bool HideConsole = true;

src/engine/shared/storage.cpp

@@ -231,8 +231,7 @@ class CStorage : public IStorage
 				"/usr/local/share/games/teeworlds/data",
 				"/usr/pkg/share/teeworlds/data",
 				"/usr/pkg/share/games/teeworlds/data",
-				"/opt/teeworlds/data",
-				"/Volumes/Teeworlds/Teeworlds.app/Contents/Resources/data"
+				"/opt/teeworlds/data"
 			};
 			const int DirsCount = sizeof(aDirs) / sizeof(aDirs[0]);
 

src/osxlaunch/client.h

@@ -0,0 +1,14 @@
+#ifndef OSXLAUNCH_CLIENT_H
+#define OSXLAUNCH_CLIENT_H
+/*	SDLMain.m - main entry point for our Cocoa-ized SDL app
+		Initial Version: Darrell Walisser <[email protected]>
+		Non-NIB-Code & other changes: Max Horn <[email protected]>
+
+	Feel free to customize this file to suit your needs
+*/
+
+#import <Cocoa/Cocoa.h>
+
+@interface SDLMain : NSObject<NSApplicationDelegate>
+@end
+#endif