Skip to content

Commit bb11c04

Browse files
authored
Merge pull request loongly#8 from loongly/dev1
Dev1 merge to master
2 parents a3be984 + 64e4e49 commit bb11c04

File tree

6 files changed

+6
-1
lines changed

6 files changed

+6
-1
lines changed

BindGenerater/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public static void ReplaceMscorlib(string libDir, string outDir)
148148
foreach (var fi in dir.GetFiles())
149149
{
150150
var tarPath = Path.Combine(outDir, fi.Name);
151-
if (File.Exists(tarPath))
151+
if (File.Exists(tarPath) || fi.Name == "netstandard.dll") // netstandard reserved for unity2020 build bug
152152
File.Copy(Path.Combine(srcDir, fi.Name), tarPath, true);
153153
}
154154
}

ScriptEngine/Tools/Binder.exe

0 Bytes
Binary file not shown.

ScriptEngine/Tools/Binder.pdb

0 Bytes
Binary file not shown.
88.5 KB
Binary file not shown.

ScriptEngine/lib/libScriptEngine.a

96 Bytes
Binary file not shown.

ScriptEngine/main/Mediator.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ void* get_il2cpp_internal_ptr(Il2CppObject* obj)
168168

169169
MonoString* get_mono_string(Il2CppString* str)
170170
{
171+
if(str == NULL)
172+
return NULL;
171173
/*char* ptr = (char*)str;
172174
int32_t* lenPtr = (int32_t*)(ptr + sizeof(void *) * 2);
173175
int32_t len = *lenPtr;
@@ -180,6 +182,9 @@ MonoString* get_mono_string(Il2CppString* str)
180182
}
181183
Il2CppString* get_il2cpp_string(MonoString* str)
182184
{
185+
if(str == NULL)
186+
return NULL;
187+
183188
int32_t len = mono_string_length(str);
184189
Il2CppChar* chars = (Il2CppChar* )mono_string_to_utf16(str);
185190

0 commit comments

Comments
 (0)