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

Merge pull request #65049 from paulloz/dotnet/win10-export 

C#: Fix .NET export template compilation on Windows
This commit is contained in:
Ignacio Roldán Etcheverry 2022-08-29 18:34:02 +02:00 committed by GitHub
parent a5218989a2 ab5807d722
commit 051f24b067
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/mono_gd/gd_mono.cpp
View File

@ -270,7 +270,7 @@ load_assembly_and_get_function_pointer_fn initialize_hostfxr_self_contained(
int i = 1; int i = 1;
for (const String &E : cmdline_args) { for (const String &E : cmdline_args) {
HostFxrCharString &stored = argv_store.push_back(str_to_hostfxr(E))->get(); HostFxrCharString &stored = argv_store.push_back(str_to_hostfxr(E))->get();
argv.write[i] = stored.ptr(); argv.write[i] = get_data(stored);
i++; i++;
} }
@ -356,7 +356,7 @@ godot_plugins_initialize_fn initialize_hostfxr_and_godot_plugins(bool &r_runtime
print_verbose(".NET: hostfxr initialized"); print_verbose(".NET: hostfxr initialized");
int rc = load_assembly_and_get_function_pointer(get_data(assembly_path), int rc = load_assembly_and_get_function_pointer(get_data(assembly_path),
str_to_hostfxr("GodotPlugins.Game.Main, " + assembly_name), get_data(str_to_hostfxr("GodotPlugins.Game.Main, " + assembly_name)),
HOSTFXR_STR("InitializeFromGameProject"), HOSTFXR_STR("InitializeFromGameProject"),
UNMANAGEDCALLERSONLY_METHOD, UNMANAGEDCALLERSONLY_METHOD,
nullptr, nullptr,