diff --git a/Source/ThirdParty/DirectXMesh/DirectXMesh.Build.cs b/Source/ThirdParty/DirectXMesh/DirectXMesh.Build.cs index baefd8ea5..391f3b683 100644 --- a/Source/ThirdParty/DirectXMesh/DirectXMesh.Build.cs +++ b/Source/ThirdParty/DirectXMesh/DirectXMesh.Build.cs @@ -16,6 +16,9 @@ public class DirectXMesh : DepsModule LicenseType = LicenseTypes.MIT; LicenseFilePath = "LICENSE"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } /// diff --git a/Source/ThirdParty/DirectXTex/DirectXTex.Build.cs b/Source/ThirdParty/DirectXTex/DirectXTex.Build.cs index 8ebc31c12..01de73cdd 100644 --- a/Source/ThirdParty/DirectXTex/DirectXTex.Build.cs +++ b/Source/ThirdParty/DirectXTex/DirectXTex.Build.cs @@ -16,6 +16,9 @@ public class DirectXTex : DepsModule LicenseType = LicenseTypes.MIT; LicenseFilePath = "LICENSE"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } /// diff --git a/Source/ThirdParty/LZ4/lz4.Build.cs b/Source/ThirdParty/LZ4/lz4.Build.cs index 1561e4b86..57020a4f4 100644 --- a/Source/ThirdParty/LZ4/lz4.Build.cs +++ b/Source/ThirdParty/LZ4/lz4.Build.cs @@ -14,5 +14,8 @@ public class lz4 : ThirdPartyModule LicenseType = LicenseTypes.BSD2Clause; LicenseFilePath = "LICENSE.txt"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } } diff --git a/Source/ThirdParty/OpenFBX/OpenFBX.Build.cs b/Source/ThirdParty/OpenFBX/OpenFBX.Build.cs index 0473bee76..a95c8beef 100644 --- a/Source/ThirdParty/OpenFBX/OpenFBX.Build.cs +++ b/Source/ThirdParty/OpenFBX/OpenFBX.Build.cs @@ -14,5 +14,8 @@ public class OpenFBX : ThirdPartyModule LicenseType = LicenseTypes.MIT; LicenseFilePath = "LICENSE.txt"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } } diff --git a/Source/ThirdParty/PhysX/PhysX.Build.cs b/Source/ThirdParty/PhysX/PhysX.Build.cs index 0c416df91..3c57c5cb4 100644 --- a/Source/ThirdParty/PhysX/PhysX.Build.cs +++ b/Source/ThirdParty/PhysX/PhysX.Build.cs @@ -17,6 +17,9 @@ public class PhysX : DepsModule LicenseType = LicenseTypes.BSD3Clause; LicenseFilePath = "License.txt"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } /// diff --git a/Source/ThirdParty/UVAtlas/UVAtlas.Build.cs b/Source/ThirdParty/UVAtlas/UVAtlas.Build.cs index 48a762186..f46c029a3 100644 --- a/Source/ThirdParty/UVAtlas/UVAtlas.Build.cs +++ b/Source/ThirdParty/UVAtlas/UVAtlas.Build.cs @@ -16,6 +16,9 @@ public class UVAtlas : DepsModule LicenseType = LicenseTypes.MIT; LicenseFilePath = "LICENSE"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } /// diff --git a/Source/ThirdParty/UniversalAnalytics/UniversalAnalytics.Build.cs b/Source/ThirdParty/UniversalAnalytics/UniversalAnalytics.Build.cs index e305af4a5..dcb294ca3 100644 --- a/Source/ThirdParty/UniversalAnalytics/UniversalAnalytics.Build.cs +++ b/Source/ThirdParty/UniversalAnalytics/UniversalAnalytics.Build.cs @@ -15,6 +15,9 @@ public class UniversalAnalytics : ThirdPartyModule LicenseType = LicenseTypes.BSD3Clause; LicenseFilePath = "LICENSE.txt"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } /// diff --git a/Source/ThirdParty/VulkanMemoryAllocator/VulkanMemoryAllocator.Build.cs b/Source/ThirdParty/VulkanMemoryAllocator/VulkanMemoryAllocator.Build.cs index ef49f4986..944a4bb5e 100644 --- a/Source/ThirdParty/VulkanMemoryAllocator/VulkanMemoryAllocator.Build.cs +++ b/Source/ThirdParty/VulkanMemoryAllocator/VulkanMemoryAllocator.Build.cs @@ -14,5 +14,8 @@ public class VulkanMemoryAllocator : HeaderOnlyModule LicenseType = LicenseTypes.MIT; LicenseFilePath = "LICENSE.txt"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } } diff --git a/Source/ThirdParty/assimp/assimp.Build.cs b/Source/ThirdParty/assimp/assimp.Build.cs index b5470c90c..4f5b1ea41 100644 --- a/Source/ThirdParty/assimp/assimp.Build.cs +++ b/Source/ThirdParty/assimp/assimp.Build.cs @@ -16,6 +16,9 @@ public class assimp : DepsModule LicenseType = LicenseTypes.Custom; LicenseFilePath = "LICENSE"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } /// diff --git a/Source/ThirdParty/curl/curl.Build.cs b/Source/ThirdParty/curl/curl.Build.cs index f2eca1fa8..35943d9f1 100644 --- a/Source/ThirdParty/curl/curl.Build.cs +++ b/Source/ThirdParty/curl/curl.Build.cs @@ -16,6 +16,9 @@ public class curl : DepsModule LicenseType = LicenseTypes.Custom; LicenseFilePath = "curl License.txt"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } /// diff --git a/Source/ThirdParty/fmt/fmt.Build.cs b/Source/ThirdParty/fmt/fmt.Build.cs index deaf81507..e88aca8ec 100644 --- a/Source/ThirdParty/fmt/fmt.Build.cs +++ b/Source/ThirdParty/fmt/fmt.Build.cs @@ -16,6 +16,9 @@ public class fmt : ThirdPartyModule LicenseType = LicenseTypes.BSD2Clause; LicenseFilePath = "cppformat license.txt"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } /// diff --git a/Source/ThirdParty/freetype/freetype.Build.cs b/Source/ThirdParty/freetype/freetype.Build.cs index 1c2abecf6..7cf93e32c 100644 --- a/Source/ThirdParty/freetype/freetype.Build.cs +++ b/Source/ThirdParty/freetype/freetype.Build.cs @@ -17,6 +17,9 @@ public class freetype : DepsModule LicenseType = LicenseTypes.Custom; LicenseFilePath = "LICENSE.TXT"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } /// diff --git a/Source/ThirdParty/glslang/glslang.Build.cs b/Source/ThirdParty/glslang/glslang.Build.cs index 6d6c911fc..5fc937ec6 100644 --- a/Source/ThirdParty/glslang/glslang.Build.cs +++ b/Source/ThirdParty/glslang/glslang.Build.cs @@ -16,6 +16,9 @@ public class glslang : DepsModule LicenseType = LicenseTypes.Custom; LicenseFilePath = "LICENSE.txt"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } /// diff --git a/Source/ThirdParty/meshoptimizer/meshoptimizer.Build.cs b/Source/ThirdParty/meshoptimizer/meshoptimizer.Build.cs index 71c59bb5f..1df8f57d7 100644 --- a/Source/ThirdParty/meshoptimizer/meshoptimizer.Build.cs +++ b/Source/ThirdParty/meshoptimizer/meshoptimizer.Build.cs @@ -14,5 +14,8 @@ public class meshoptimizer : ThirdPartyModule LicenseType = LicenseTypes.MIT; LicenseFilePath = "LICENSE.md"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } } diff --git a/Source/ThirdParty/minimp3/minimp3.Build.cs b/Source/ThirdParty/minimp3/minimp3.Build.cs index 1a41c4dc5..71bccabfc 100644 --- a/Source/ThirdParty/minimp3/minimp3.Build.cs +++ b/Source/ThirdParty/minimp3/minimp3.Build.cs @@ -14,5 +14,8 @@ public class minimp3 : HeaderOnlyModule LicenseType = LicenseTypes.CreativeCommonsZero; LicenseFilePath = "LICENSE"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } } diff --git a/Source/ThirdParty/mono-2.0/mono.Build.cs b/Source/ThirdParty/mono-2.0/mono.Build.cs index f0482acff..cbfefcf6b 100644 --- a/Source/ThirdParty/mono-2.0/mono.Build.cs +++ b/Source/ThirdParty/mono-2.0/mono.Build.cs @@ -17,6 +17,9 @@ public class mono : DepsModule LicenseType = LicenseTypes.Custom; LicenseFilePath = "LICENSE"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } /// diff --git a/Source/ThirdParty/ogg/ogg.Build.cs b/Source/ThirdParty/ogg/ogg.Build.cs index 52271e89f..5a2e1d7db 100644 --- a/Source/ThirdParty/ogg/ogg.Build.cs +++ b/Source/ThirdParty/ogg/ogg.Build.cs @@ -16,6 +16,9 @@ public class ogg : DepsModule LicenseType = LicenseTypes.Custom; LicenseFilePath = "COPYING"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } /// diff --git a/Source/ThirdParty/pugixml/pugixml.Build.cs b/Source/ThirdParty/pugixml/pugixml.Build.cs index 23e7889e5..5edca17b4 100644 --- a/Source/ThirdParty/pugixml/pugixml.Build.cs +++ b/Source/ThirdParty/pugixml/pugixml.Build.cs @@ -14,5 +14,8 @@ public class pugixml : ThirdPartyModule LicenseType = LicenseTypes.MIT; LicenseFilePath = "pugixml license.txt"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } } diff --git a/Source/ThirdParty/rapidjson/rapidjson.Build.cs b/Source/ThirdParty/rapidjson/rapidjson.Build.cs index 970cec0ae..7c7f033e0 100644 --- a/Source/ThirdParty/rapidjson/rapidjson.Build.cs +++ b/Source/ThirdParty/rapidjson/rapidjson.Build.cs @@ -16,6 +16,9 @@ public class rapidjson : HeaderOnlyModule LicenseType = LicenseTypes.MIT; LicenseFilePath = "RapidJSON license.txt"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } /// diff --git a/Source/ThirdParty/recastnavigation/recastnavigation.Build.cs b/Source/ThirdParty/recastnavigation/recastnavigation.Build.cs index b124f5301..3526b4044 100644 --- a/Source/ThirdParty/recastnavigation/recastnavigation.Build.cs +++ b/Source/ThirdParty/recastnavigation/recastnavigation.Build.cs @@ -14,5 +14,8 @@ public class recastnavigation : ThirdPartyModule LicenseType = LicenseTypes.zLib; LicenseFilePath = "License.txt"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } } diff --git a/Source/ThirdParty/spirv-tools/spirv_tools.Build.cs b/Source/ThirdParty/spirv-tools/spirv_tools.Build.cs index d503f8c4e..293ed1510 100644 --- a/Source/ThirdParty/spirv-tools/spirv_tools.Build.cs +++ b/Source/ThirdParty/spirv-tools/spirv_tools.Build.cs @@ -17,6 +17,9 @@ public class spirv_tools : DepsModule Name = "spirv-tools"; LicenseType = LicenseTypes.Custom; LicenseFilePath = "LICENSE.txt"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } /// diff --git a/Source/ThirdParty/stb/stb.Build.cs b/Source/ThirdParty/stb/stb.Build.cs index decbc74c5..03319cb5a 100644 --- a/Source/ThirdParty/stb/stb.Build.cs +++ b/Source/ThirdParty/stb/stb.Build.cs @@ -15,6 +15,9 @@ public class stb : HeaderOnlyModule LicenseType = LicenseTypes.MIT; LicenseFilePath = "LICENSE.txt"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } /// diff --git a/Source/ThirdParty/volk/volk.Build.cs b/Source/ThirdParty/volk/volk.Build.cs index ab4e1a224..82bb2572b 100644 --- a/Source/ThirdParty/volk/volk.Build.cs +++ b/Source/ThirdParty/volk/volk.Build.cs @@ -15,6 +15,9 @@ public class volk : ThirdPartyModule LicenseType = LicenseTypes.MIT; LicenseFilePath = "LICENSE.txt"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } /// diff --git a/Source/ThirdParty/vorbis/vorbis.Build.cs b/Source/ThirdParty/vorbis/vorbis.Build.cs index f61dc2c10..d743ff327 100644 --- a/Source/ThirdParty/vorbis/vorbis.Build.cs +++ b/Source/ThirdParty/vorbis/vorbis.Build.cs @@ -16,6 +16,9 @@ public class vorbis : DepsModule LicenseType = LicenseTypes.Custom; LicenseFilePath = "COPYING"; + + // Merge third-party modules into engine binary + BinaryModuleName = "FlaxEngine"; } /// diff --git a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.cs b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.cs index a9c11136e..742aa6f63 100644 --- a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.cs +++ b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.cs @@ -72,7 +72,7 @@ namespace Flax.Build.Bindings buildData.ModulesInfo.Add(module, moduleInfo); // Skip for modules that cannot have API bindings - if (module is ThirdPartyModule || !module.BuildNativeCode) + if (!module.BuildCSharp || !module.BuildNativeCode) return moduleInfo; if (moduleOptions == null) diff --git a/Source/Tools/Flax.Build/Build/ThirdPartyModule.cs b/Source/Tools/Flax.Build/Build/ThirdPartyModule.cs index b7013b4b5..ac75f717c 100644 --- a/Source/Tools/Flax.Build/Build/ThirdPartyModule.cs +++ b/Source/Tools/Flax.Build/Build/ThirdPartyModule.cs @@ -187,8 +187,8 @@ namespace Flax.Build /// public ThirdPartyModule() { - // Merge third-party modules into engine binary - BinaryModuleName = "FlaxEngine"; + // Third-party modules are native and don't use bindings by default + BuildCSharp = false; } ///