maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #43768 from sjml/mac-mono-export-fix

Browse source 
Mono/macOS: Separate data dir into frameworks and resources for codesigning
This commit is contained in:
Rémi Verschelde 2021-03-03 22:42:44 +01:00 committed by GitHub
parent 0599e5f07a 42eb09ddcc
commit 338fa05acc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/mono/godotsharp_dirs.cpp
View file

@ -179,16 +179,16 @@ private:
#ifdef OSX_ENABLED #ifdef OSX_ENABLED
if (!DirAccess::exists(data_editor_tools_dir)) { if (!DirAccess::exists(data_editor_tools_dir)) {
data_editor_tools_dir = exe_dir.plus_file("../Frameworks/GodotSharp/Tools"); data_editor_tools_dir = exe_dir.plus_file("../Resources/GodotSharp/Tools");
} }
if (!DirAccess::exists(data_editor_prebuilt_api_dir)) { if (!DirAccess::exists(data_editor_prebuilt_api_dir)) {
data_editor_prebuilt_api_dir = exe_dir.plus_file("../Frameworks/GodotSharp/Api"); data_editor_prebuilt_api_dir = exe_dir.plus_file("../Resources/GodotSharp/Api");
} }
if (!DirAccess::exists(data_mono_root_dir)) { if (!DirAccess::exists(data_mono_root_dir)) {
data_mono_etc_dir = exe_dir.plus_file("../Resources/GodotSharp/Mono/etc"); data_mono_etc_dir = exe_dir.plus_file("../Resources/GodotSharp/Mono/etc");
data_mono_lib_dir = exe_dir.plus_file("../Frameworks/GodotSharp/Mono/lib"); data_mono_lib_dir = exe_dir.plus_file("../Resources/GodotSharp/Mono/lib");
} }
#endif #endif
@ -218,11 +218,11 @@ private:
#ifdef OSX_ENABLED #ifdef OSX_ENABLED
if (!DirAccess::exists(data_mono_root_dir)) { if (!DirAccess::exists(data_mono_root_dir)) {
data_mono_etc_dir = exe_dir.plus_file("../Resources/GodotSharp/Mono/etc"); data_mono_etc_dir = exe_dir.plus_file("../Resources/GodotSharp/Mono/etc");
data_mono_lib_dir = exe_dir.plus_file("../Frameworks/GodotSharp/Mono/lib"); data_mono_lib_dir = exe_dir.plus_file("../Resources/GodotSharp/Mono/lib");
} }
if (!DirAccess::exists(data_game_assemblies_dir)) { if (!DirAccess::exists(data_game_assemblies_dir)) {
data_game_assemblies_dir = exe_dir.plus_file("../Frameworks/GodotSharp/Assemblies"); data_game_assemblies_dir = exe_dir.plus_file("../Resources/GodotSharp/Assemblies");
} }
#endif #endif

6
platform/osx/export/export.cpp
View file

@ -114,7 +114,7 @@ public:
virtual void get_platform_features(List<String> *r_features) override { virtual void get_platform_features(List<String> *r_features) override {
r_features->push_back("pc"); r_features->push_back("pc");
r_features->push_back("s3tc"); r_features->push_back("s3tc");
r_features->push_back("OSX"); r_features->push_back("macOS");
} }
virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, Set<String> &p_features) override { virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, Set<String> &p_features) override {
@ -702,14 +702,14 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p
ret = unzGoToNextFile(src_pkg_zip); ret = unzGoToNextFile(src_pkg_zip);
continue; // skip continue; // skip
} }
file = file.replace("/data.mono.osx.64.release_debug/", "/data_" + pkg_name + "/"); file = file.replace("/data.mono.osx.64.release_debug/", "/GodotSharp/");
} }
if (file.find("/data.mono.osx.64.release/") != -1) { if (file.find("/data.mono.osx.64.release/") != -1) {
if (p_debug) { if (p_debug) {
ret = unzGoToNextFile(src_pkg_zip); ret = unzGoToNextFile(src_pkg_zip);
continue; // skip continue; // skip
} }
file = file.replace("/data.mono.osx.64.release/", "/data_" + pkg_name + "/"); file = file.replace("/data.mono.osx.64.release/", "/GodotSharp/");
} }
if (file.ends_with(".dylib")) { if (file.ends_with(".dylib")) {