diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-10-05 21:02:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-05 21:02:27 +0200 |
| commit | a7ba22763139b29d825e0f4ef3e718533da069ea (patch) | |
| tree | 63e38379d45985297d0e3250bdc3d6bd025c4f25 /modules | |
| parent | 869a618e542252a42d0f5feab18a7916aec7109d (diff) | |
| parent | 69f890ff11a15cc2c1aa651801a872505ab08c81 (diff) | |
Merge pull request #52711 from m4gr3d/provide_getter_for_project_data_dir_master
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Client.cs | 1 | ||||
| -rw-r--r-- | modules/mono/godotsharp_dirs.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Client.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Client.cs index 0f50c90531..1d7bfaf0a4 100644 --- a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Client.cs +++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Client.cs @@ -121,6 +121,7 @@ namespace GodotTools.IdeMessaging this.messageHandler = messageHandler; this.logger = logger; + // TODO: Need to fetch the project data dir name from ProjectSettings instead of defaulting to ".godot" string projectMetadataDir = Path.Combine(godotProjectDir, ".godot", "mono", "metadata"); MetaFilePath = Path.Combine(projectMetadataDir, GodotIdeMetadata.DefaultFileName); diff --git a/modules/mono/godotsharp_dirs.cpp b/modules/mono/godotsharp_dirs.cpp index 375ad413c4..24bd1ed492 100644 --- a/modules/mono/godotsharp_dirs.cpp +++ b/modules/mono/godotsharp_dirs.cpp @@ -122,7 +122,7 @@ public: private: _GodotSharpDirs() { - res_data_dir = "res://.godot/mono"; + res_data_dir = ProjectSettings::get_singleton()->get_project_data_path().plus_file("mono"); res_metadata_dir = res_data_dir.plus_file("metadata"); res_assemblies_base_dir = res_data_dir.plus_file("assemblies"); res_assemblies_dir = res_assemblies_base_dir.plus_file(GDMono::get_expected_api_build_config()); |