diff options
| author | Ignacio Roldán Etcheverry <neikeq@users.noreply.github.com> | 2022-09-09 01:12:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-09 01:12:13 +0200 |
| commit | 95c35417cdf82c990075953320a0d06c81b6c980 (patch) | |
| tree | 7f1ddb597e63ddcb4cf6055bd681c7ee6d937ca0 /modules/mono/editor/hostfxr_resolver.cpp | |
| parent | fbb9ccc071fe756904305c828e3e286598bbf474 (diff) | |
| parent | f63cfc12c5c7af79b8a4e2380458b591711157ff (diff) | |
Merge pull request #65546 from raulsntos/dotnet/macos
Fix MacOS compiler flags in .NET module
Diffstat (limited to 'modules/mono/editor/hostfxr_resolver.cpp')
| -rw-r--r-- | modules/mono/editor/hostfxr_resolver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/mono/editor/hostfxr_resolver.cpp b/modules/mono/editor/hostfxr_resolver.cpp index bdc8fac8b5..ea5978b2cd 100644 --- a/modules/mono/editor/hostfxr_resolver.cpp +++ b/modules/mono/editor/hostfxr_resolver.cpp @@ -82,7 +82,7 @@ namespace { String get_hostfxr_file_name() { #if defined(WINDOWS_ENABLED) || defined(UWP_ENABLED) return "hostfxr.dll"; -#elif defined(OSX_ENABLED) || defined(IOS_ENABLED) +#elif defined(MACOS_ENABLED) || defined(IOS_ENABLED) return "libhostfxr.dylib"; #else return "libhostfxr.so"; @@ -197,7 +197,7 @@ bool get_default_installation_dir(String &r_dotnet_root) { r_dotnet_root = path::join(program_files_dir, "dotnet"); return true; -#elif defined(TARGET_OSX) +#elif defined(MACOS_ENABLED) r_dotnet_root = "/usr/local/share/dotnet"; #if defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) || defined(_M_X64) |