From 1e94b327f6f4619202672520cd6db94dbbfce74b Mon Sep 17 00:00:00 2001 From: Yordan Chaparov Date: Thu, 28 Sep 2023 15:33:15 +0100 Subject: [PATCH] Exclude AssimpNet/win DLLs from WebGL builds In the same project, we use URDF-Importer in Unitye Editor, but we also have scenes that are built for WebGL. As noted in https://github.com/Unity-Technologies/URDF-Importer/issues/201 WebGL builds of a project that has URDF-Importer package always fail, even if URDF-Importer is not used during runtime. This commit marks the conflicting plugins to exclude WebGL. NOTE: URDF-Importer scripts will not be usable in WebGL builds: Runtime/Unity.Robotics.URDFImporter.asmdef still excludes WebGL. This change allows scenes that don't use URDF-Importer to build. --- .../Plugins/AssimpNet/Native/win/x86/assimp.dll.meta | 1 + .../Plugins/AssimpNet/Native/win/x86_64/assimp.dll.meta | 1 + 2 files changed, 2 insertions(+) diff --git a/com.unity.robotics.urdf-importer/Runtime/UnityMeshImporter/Plugins/AssimpNet/Native/win/x86/assimp.dll.meta b/com.unity.robotics.urdf-importer/Runtime/UnityMeshImporter/Plugins/AssimpNet/Native/win/x86/assimp.dll.meta index b652b534..8ce65ced 100644 --- a/com.unity.robotics.urdf-importer/Runtime/UnityMeshImporter/Plugins/AssimpNet/Native/win/x86/assimp.dll.meta +++ b/com.unity.robotics.urdf-importer/Runtime/UnityMeshImporter/Plugins/AssimpNet/Native/win/x86/assimp.dll.meta @@ -21,6 +21,7 @@ PluginImporter: Exclude Linux64: 0 Exclude LinuxUniversal: 0 Exclude OSXUniversal: 0 + Exclude WebGL: 1 Exclude Win: 0 Exclude Win64: 1 - first: diff --git a/com.unity.robotics.urdf-importer/Runtime/UnityMeshImporter/Plugins/AssimpNet/Native/win/x86_64/assimp.dll.meta b/com.unity.robotics.urdf-importer/Runtime/UnityMeshImporter/Plugins/AssimpNet/Native/win/x86_64/assimp.dll.meta index 3cd8c864..e92e6e55 100644 --- a/com.unity.robotics.urdf-importer/Runtime/UnityMeshImporter/Plugins/AssimpNet/Native/win/x86_64/assimp.dll.meta +++ b/com.unity.robotics.urdf-importer/Runtime/UnityMeshImporter/Plugins/AssimpNet/Native/win/x86_64/assimp.dll.meta @@ -21,6 +21,7 @@ PluginImporter: Exclude Linux64: 0 Exclude LinuxUniversal: 0 Exclude OSXUniversal: 0 + Exclude WebGL: 1 Exclude Win: 1 Exclude Win64: 0 Exclude WindowsStoreApps: 0