godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #65546 from raulsntos/dotnet/macos 

Fix MacOS compiler flags in .NET module
This commit is contained in:
Ignacio Roldán Etcheverry 2022-09-09 01:12:13 +02:00 committed by GitHub
parent fbb9ccc071 f63cfc12c5
commit 95c35417cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/mono/editor/hostfxr_resolver.cpp
View File

@ -82,7 +82,7 @@ namespace {
String get_hostfxr_file_name() { String get_hostfxr_file_name() {
#if defined(WINDOWS_ENABLED) || defined(UWP_ENABLED) #if defined(WINDOWS_ENABLED) || defined(UWP_ENABLED)
return "hostfxr.dll"; return "hostfxr.dll";
#elif defined(OSX_ENABLED) || defined(IOS_ENABLED) #elif defined(MACOS_ENABLED) || defined(IOS_ENABLED)
return "libhostfxr.dylib"; return "libhostfxr.dylib";
#else #else
return "libhostfxr.so"; 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"); r_dotnet_root = path::join(program_files_dir, "dotnet");
return true; return true;
#elif defined(TARGET_OSX) #elif defined(MACOS_ENABLED)
r_dotnet_root = "/usr/local/share/dotnet"; r_dotnet_root = "/usr/local/share/dotnet";
#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) || defined(_M_X64) #if defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) || defined(_M_X64)