4 files changed, 50 insertions, 42 deletions

diff --git a/platform/osx/export/export.cpp b/platform/osx/export/export.cpp
index ce7b47c414..cf38664022 100644
--- a/platform/osx/export/export.cpp
+++ b/platform/osx/export/export.cpp
@@ -502,6 +502,8 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p
 	else
 		pkg_name = "Unnamed";
 
+	String pkg_name_safe = OS::get_singleton()->get_safe_dir_name(pkg_name);
+
 	Error err = OK;
 	String tmp_app_path_name = "";
 	zlib_filefunc_def io2 = io;
@@ -509,12 +511,13 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p
 	io2.opaque = &dst_f;
 	zipFile dst_pkg_zip = NULL;
 
+	DirAccess *tmp_app_path = NULL;
 	String export_format = use_dmg() && p_path.ends_with("dmg") ? "dmg" : "zip";
 	if (export_format == "dmg") {
 		// We're on OSX so we can export to DMG, but first we create our application bundle
 		tmp_app_path_name = EditorSettings::get_singleton()->get_cache_dir().plus_file(pkg_name + ".app");
 		print_line("Exporting to " + tmp_app_path_name);
-		DirAccess *tmp_app_path = DirAccess::create_for_path(tmp_app_path_name);
+		tmp_app_path = DirAccess::create_for_path(tmp_app_path_name);
 		if (!tmp_app_path) {
 			err = ERR_CANT_CREATE;
 		}
@@ -611,25 +614,45 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p
 		}
 
 		if (data.size() > 0) {
+
+			if (file.find("/data.mono.osx.64.release_debug/") != -1) {
+				if (!p_debug) {
+					ret = unzGoToNextFile(src_pkg_zip);
+					continue; //skip
+				}
+				file = file.replace("/data.mono.osx.64.release_debug/", "/data_" + pkg_name_safe + "/");
+			}
+			if (file.find("/data.mono.osx.64.release/") != -1) {
+				if (p_debug) {
+					ret = unzGoToNextFile(src_pkg_zip);
+					continue; //skip
+				}
+				file = file.replace("/data.mono.osx.64.release/", "/data_" + pkg_name_safe + "/");
+			}
+
 			print_line("ADDING: " + file + " size: " + itos(data.size()));
 			total_size += data.size();
 
 			if (export_format == "dmg") {
 				// write it into our application bundle
 				file = tmp_app_path_name.plus_file(file);
-
-				// write the file, need to add chmod
-				FileAccess *f = FileAccess::open(file, FileAccess::WRITE);
-				if (f) {
-					f->store_buffer(data.ptr(), data.size());
-					f->close();
-					if (is_execute) {
-						// Chmod with 0755 if the file is executable
-						FileAccess::set_unix_permissions(file, 0755);
+				if (err == OK) {
+					err = tmp_app_path->make_dir_recursive(file.get_base_dir());
+				}
+				if (err == OK) {
+					// write the file, need to add chmod
+					FileAccess *f = FileAccess::open(file, FileAccess::WRITE);
+					if (f) {
+						f->store_buffer(data.ptr(), data.size());
+						f->close();
+						if (is_execute) {
+							// Chmod with 0755 if the file is executable
+							FileAccess::set_unix_permissions(file, 0755);
+						}
+						memdelete(f);
+					} else {
+						err = ERR_CANT_CREATE;
 					}
-					memdelete(f);
-				} else {
-					err = ERR_CANT_CREATE;
 				}
 			} else {
 				// add it to our zip file
diff --git a/platform/osx/godot_main_osx.mm b/platform/osx/godot_main_osx.mm
index 73fd4632ab..e6f8cbecf1 100644
--- a/platform/osx/godot_main_osx.mm
+++ b/platform/osx/godot_main_osx.mm
@@ -45,35 +45,6 @@ int main(int argc, char **argv) {
 		printf("%i: %s\n", i, argv[i]);
 	};
 
-	if (argc >= 1 && argv[0][0] == '/') {
-		//potentially launched from finder
-		int len = strlen(argv[0]);
-		while (len--) {
-			if (argv[0][len] == '/') break;
-		}
-		if (len >= 0) {
-			char *path = (char *)malloc(len + 1);
-			memcpy(path, argv[0], len);
-			path[len] = 0;
-
-			char *pathinfo = (char *)malloc(strlen(path) + strlen("/../Info.plist") + 1);
-			//in real code you would check for errors in malloc here
-			strcpy(pathinfo, path);
-			strcat(pathinfo, "/../Info.plist");
-
-			FILE *f = fopen(pathinfo, "rb");
-			if (f) {
-				//running from app bundle, as Info.plist was found
-				fclose(f);
-				chdir(path);
-				chdir("../Resources"); //data.pck, or just the files are here
-			}
-
-			free(path);
-			free(pathinfo);
-		}
-	}
-
 #ifdef DEBUG_ENABLED
 	// lets report the path we made current after all that
 	char cwd[4096];
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h
index 44c5412a39..58a47c102a 100644
--- a/platform/osx/os_osx.h
+++ b/platform/osx/os_osx.h
@@ -223,6 +223,7 @@ public:
 	virtual String get_config_path() const;
 	virtual String get_data_path() const;
 	virtual String get_cache_path() const;
+	virtual String get_bundle_resource_dir() const;
 	virtual String get_godot_dir_name() const;
 
 	virtual String get_system_dir(SystemDir p_dir) const;
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index 95c103bd28..2b002d3b5d 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -2111,6 +2111,19 @@ String OS_OSX::get_cache_path() const {
 	}
 }
 
+String OS_OSX::get_bundle_resource_dir() const {
+
+	NSBundle *main = [NSBundle mainBundle];
+	NSString *resourcePath = [main resourcePath];
+
+	char *utfs = strdup([resourcePath UTF8String]);
+	String ret;
+	ret.parse_utf8(utfs);
+	free(utfs);
+
+	return ret;
+}
+
 // Get properly capitalized engine name for system paths
 String OS_OSX::get_godot_dir_name() const {