GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix mono compile

Browse Source
This commit is contained in:
mafiesto4
2021-02-01 09:59:25 +01:00
parent f77d0cc8fc
commit ed10c15069
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Scripting/ManagedCLR/MCore.Mono.cpp
View File

@@ -27,7 +27,7 @@
#include <ThirdParty/mono-2.0/mono/metadata/mono-config.h> #include <ThirdParty/mono-2.0/mono/metadata/mono-config.h>
#include <ThirdParty/mono-2.0/mono/metadata/mono-gc.h> #include <ThirdParty/mono-2.0/mono/metadata/mono-gc.h>
#include <ThirdParty/mono-2.0/mono/metadata/profiler.h> #include <ThirdParty/mono-2.0/mono/metadata/profiler.h>
#if USE_MONO_DYNAMIC_LIB #if !USE_MONO_DYNAMIC_LIB
#include <ThirdParty/mono-2.0/mono/utils/mono-dl-fallback.h> #include <ThirdParty/mono-2.0/mono/utils/mono-dl-fallback.h>
#endif #endif

6
Source/ThirdParty/mono-2.0/mono.Build.cs vendored
View File

@@ -37,7 +37,7 @@ public class mono : DepsModule
if (useDynamicLinking) if (useDynamicLinking)
{ {
// Dynamic linking (requires mono-2.0-sgen.dll to deploy side-by-side with the Flax) // Dynamic linking (requires mono-2.0-sgen.dll to deploy side-by-side with the Flax)
options.PrivateDefinitions.Add("USE_MONO_DYNAMIC_LIB"); options.PublicDefinitions.Add("USE_MONO_DYNAMIC_LIB");
options.OutputFiles.Add(Path.Combine(depsRoot, "mono-2.0-sgen.lib")); options.OutputFiles.Add(Path.Combine(depsRoot, "mono-2.0-sgen.lib"));
options.DependencyFiles.Add(Path.Combine(depsRoot, "mono-2.0-sgen.dll")); options.DependencyFiles.Add(Path.Combine(depsRoot, "mono-2.0-sgen.dll"));
options.OptionalDependencyFiles.Add(Path.Combine(depsRoot, "mono-2.0-sgen.pdb")); options.OptionalDependencyFiles.Add(Path.Combine(depsRoot, "mono-2.0-sgen.pdb"));
@@ -68,7 +68,7 @@ public class mono : DepsModule
break; break;
} }
case TargetPlatform.Linux: case TargetPlatform.Linux:
options.PrivateDefinitions.Add("USE_MONO_DYNAMIC_LIB"); options.PublicDefinitions.Add("USE_MONO_DYNAMIC_LIB");
options.DependencyFiles.Add(Path.Combine(depsRoot, "libmonosgen-2.0.so")); options.DependencyFiles.Add(Path.Combine(depsRoot, "libmonosgen-2.0.so"));
options.DependencyFiles.Add(Path.Combine(depsRoot, "libmonosgen-2.0.so.1")); options.DependencyFiles.Add(Path.Combine(depsRoot, "libmonosgen-2.0.so.1"));
options.DependencyFiles.Add(Path.Combine(depsRoot, "libmonosgen-2.0.so.1.0.0")); options.DependencyFiles.Add(Path.Combine(depsRoot, "libmonosgen-2.0.so.1.0.0"));
@@ -81,7 +81,7 @@ public class mono : DepsModule
options.OutputFiles.Add(Path.Combine(depsRoot, "mono.a")); options.OutputFiles.Add(Path.Combine(depsRoot, "mono.a"));
break; break;
case TargetPlatform.Android: case TargetPlatform.Android:
options.PrivateDefinitions.Add("USE_MONO_DYNAMIC_LIB"); options.PublicDefinitions.Add("USE_MONO_DYNAMIC_LIB");
options.DependencyFiles.Add(Path.Combine(depsRoot, "libmonosgen-2.0.so")); options.DependencyFiles.Add(Path.Combine(depsRoot, "libmonosgen-2.0.so"));
options.Libraries.Add(Path.Combine(depsRoot, "libmonosgen-2.0.so")); options.Libraries.Add(Path.Combine(depsRoot, "libmonosgen-2.0.so"));
break; break;