diff --git a/Source/Engine/Scripting/ScriptingObject.cpp b/Source/Engine/Scripting/ScriptingObject.cpp index dd9cf57a8..5cdea3ab4 100644 --- a/Source/Engine/Scripting/ScriptingObject.cpp +++ b/Source/Engine/Scripting/ScriptingObject.cpp @@ -11,7 +11,6 @@ #include "ManagedCLR/MClass.h" #include "ManagedCLR/MUtils.h" #include "ManagedCLR/MField.h" -#include "ManagedCLR/MUtils.h" #if PLATFORM_LINUX #include "ManagedCLR/MCore.h" #endif diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/MonoPosixHelper.dll b/Source/Platforms/Windows/Binaries/ThirdParty/x64/MonoPosixHelper.dll index 65c280e99..dd082f208 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/MonoPosixHelper.dll +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/MonoPosixHelper.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ad92c41f484482e217f791b5ae7963f5d55c2799bc5578125a88f2d40f33262 +oid sha256:35a252fcb61a805c85558646d073e32f7eb54666931a73380b4dea2879c72584 size 157696 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/eglib.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/eglib.pdb index 1cb5d5f43..a79f59aac 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/eglib.pdb +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/eglib.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86d71f01f6ba35e763467eb5b2be703831065ae7c9438fde4a32e1cd40d68880 -size 151552 +oid sha256:1ff34e923a27392a70eb465df1ecc03372aadac6f2753832cce3d82cd5ae1b75 +size 159744 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/libgcmonosgen.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/libgcmonosgen.pdb index 2c08c3457..166a8df92 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/libgcmonosgen.pdb +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/libgcmonosgen.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7a6731228669866ebfb450bdd14bdb6e54eef8dcc10c36640016630ded6ef73 -size 290816 +oid sha256:d165b1a28ce64c030b4d242b86b813292ce038e0155ad0d6025ed7472e036ce4 +size 348160 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/libmini.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/libmini.pdb index a06e2ddf2..719362b2d 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/libmini.pdb +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/libmini.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e12dfaf49963f4b736d9fbd7bbe16ccbf79045d64df71edc5209ffb25e0d1e0 -size 667648 +oid sha256:9cc98ae831f784a7dd6f15a1dbb083c63e6c50100a201501a7825a6d85baf53e +size 864256 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/libmono-static.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/libmono-static.lib index ab2d5015d..1cc28852d 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/libmono-static.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/libmono-static.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b90fdbcfab9d89be16789604edbab46ee8ed0159846be60714ef27ac4444baf2 -size 28391654 +oid sha256:2eac1fd52b8d87a0fe4dce3c02e68da8b35bfaa44cb1689d5d8935f2ba09531b +size 28241218 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/libmonoruntime.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/libmonoruntime.pdb index e2e07cc4a..c60e7dbe4 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/libmonoruntime.pdb +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/libmonoruntime.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db47e63ec05d2c50d661f89c062931787be1722e0387f0076b910a9092fbe962 -size 995328 +oid sha256:188ebd527b432f33f8bfccb4fbada27b029f362918ab5c4b6f82584f9d30b6f3 +size 1249280 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/libmonoutils.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/libmonoutils.pdb index 87d823d36..30be1562b 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/libmonoutils.pdb +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/libmonoutils.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3846908f7e00e2ef725c4c770dc69c277491c7e83df6047871fc9cd672d47a6d -size 299008 +oid sha256:289966b7d9ff6255e38a6e45d2b9a5179c42e0f1add6abb70f7fa5501dfc59bc +size 356352 diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/mono.cs b/Source/Tools/Flax.Build/Deps/Dependencies/mono.cs index ca23d81ea..92c9bdec9 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/mono.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/mono.cs @@ -258,9 +258,8 @@ namespace Flax.Deps.Dependencies "mono_type_normalize", }; - private void BuildMsvc(BuildOptions options, TargetPlatform platform, TargetArchitecture architecture) + private void BuildMsvc(BuildOptions options, TargetPlatform platform, TargetArchitecture architecture, string configuration = "Release") { - var configuration = "Release"; string buildPlatform; switch (architecture) { @@ -491,12 +490,13 @@ namespace Flax.Deps.Dependencies { case TargetPlatform.Windows: { - BuildMsvc(options, platform, TargetArchitecture.x64); + var configuration = "Release"; + BuildMsvc(options, platform, TargetArchitecture.x64, configuration); //BuildBcl(options, platform); // Export header files - Deploy.VCEnvironment.BuildSolution(Path.Combine(root, "msvc", "libmono-dynamic.vcxproj"), "Release", "x64"); - Deploy.VCEnvironment.BuildSolution(Path.Combine(root, "msvc", "build-install.vcxproj"), "Release", "x64"); + Deploy.VCEnvironment.BuildSolution(Path.Combine(root, "msvc", "libmono-dynamic.vcxproj"), configuration, "x64"); + Deploy.VCEnvironment.BuildSolution(Path.Combine(root, "msvc", "build-install.vcxproj"), configuration, "x64"); // Get exported mono methods to forward them in engine module (on Win32 platforms) GetMonoExports(options);