From e237ba78fe0b8c024304248b1855777ed4b380af Mon Sep 17 00:00:00 2001
From: Junrou Nishida <homuler@users.noreply.github.com>
Date: Mon, 21 Feb 2022 14:14:05 +0900
Subject: [PATCH] fix(plugin): load mediapipe_c.dll on Windows properly (#455)

* fix(plugin): rename libmediapipe_c.dll -> mediapipe_c.dll

* fix(plugin): move dependent.dlls to the same directory
---
 .../Runtime/Plugins/OpenCV.meta                       |  8 --------
 .../{libmediapipe_c.dll.meta => mediapipe_c.dll.meta} |  0
 .../Plugins/{OpenCV => }/opencv_world3416.dll.meta    | 11 ++---------
 mediapipe_api/BUILD                                   |  4 ++--
 4 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 Packages/com.github.homuler.mediapipe/Runtime/Plugins/OpenCV.meta
 rename Packages/com.github.homuler.mediapipe/Runtime/Plugins/{libmediapipe_c.dll.meta => mediapipe_c.dll.meta} (100%)
 rename Packages/com.github.homuler.mediapipe/Runtime/Plugins/{OpenCV => }/opencv_world3416.dll.meta (85%)

diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Plugins/OpenCV.meta b/Packages/com.github.homuler.mediapipe/Runtime/Plugins/OpenCV.meta
deleted file mode 100644
index 393fdbe88..000000000
--- a/Packages/com.github.homuler.mediapipe/Runtime/Plugins/OpenCV.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f317e9cb233981606887a1bdec70bda0
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Plugins/libmediapipe_c.dll.meta b/Packages/com.github.homuler.mediapipe/Runtime/Plugins/mediapipe_c.dll.meta
similarity index 100%
rename from Packages/com.github.homuler.mediapipe/Runtime/Plugins/libmediapipe_c.dll.meta
rename to Packages/com.github.homuler.mediapipe/Runtime/Plugins/mediapipe_c.dll.meta
diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Plugins/OpenCV/opencv_world3416.dll.meta b/Packages/com.github.homuler.mediapipe/Runtime/Plugins/opencv_world3416.dll.meta
similarity index 85%
rename from Packages/com.github.homuler.mediapipe/Runtime/Plugins/OpenCV/opencv_world3416.dll.meta
rename to Packages/com.github.homuler.mediapipe/Runtime/Plugins/opencv_world3416.dll.meta
index 146d35d72..a280b78cf 100644
--- a/Packages/com.github.homuler.mediapipe/Runtime/Plugins/OpenCV/opencv_world3416.dll.meta
+++ b/Packages/com.github.homuler.mediapipe/Runtime/Plugins/opencv_world3416.dll.meta
@@ -1,12 +1,12 @@
 fileFormatVersion: 2
-guid: 9431fdf3810e2be4a9331dec4ad7cc28
+guid: a8c3c9acc1418d94eadad8b8e9d0417d
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2
   iconMap: {}
   executionOrder: {}
   defineConstraints: []
-  isPreloaded: 1
+  isPreloaded: 0
   isOverridable: 1
   isExplicitlyReferenced: 0
   validateReferences: 1
@@ -16,18 +16,11 @@ PluginImporter:
     second:
       enabled: 0
       settings:
-        Exclude Android: 1
         Exclude Editor: 0
         Exclude Linux64: 0
         Exclude OSXUniversal: 0
         Exclude Win: 0
         Exclude Win64: 0
-  - first:
-      Android: Android
-    second:
-      enabled: 0
-      settings:
-        CPU: ARMv7
   - first:
       Any: 
     second:
diff --git a/mediapipe_api/BUILD b/mediapipe_api/BUILD
index 2e4b23971..45e70a71a 100644
--- a/mediapipe_api/BUILD
+++ b/mediapipe_api/BUILD
@@ -62,7 +62,7 @@ cc_binary(
 )
 
 cc_binary(
-    name = "libmediapipe_c.dll",
+    name = "mediapipe_c.dll",
     linkshared = True,
     linkstatic = True,
     visibility = ["//visibility:public"],
@@ -87,7 +87,7 @@ alias(
     name = "libmediapipe_c",
     actual = select({
         "@com_google_mediapipe//mediapipe:macos": ":libmediapipe_c.dylib",
-        "@com_google_mediapipe//mediapipe:windows": ":libmediapipe_c.dll",
+        "@com_google_mediapipe//mediapipe:windows": ":mediapipe_c.dll",
         "@com_google_mediapipe//mediapipe:emscripten": ":libmediapipe_c.bc",
         "//conditions:default": ":libmediapipe_c.so",
     }),