upd - Added new dependencies

--- Due to unexpected dependency changes caused by recent changes to our MSYS2 environment, we had to add extra dependencies. --- Type: upd Breaking: False Doc Required: False Backport Required: False Part: 1/1
Aptivi · Aug 5, 2024 · fffb952 · fffb952
1 parent 61a9020
commit fffb952
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 3 deletions.
diff --git a/Magico.Native/Initializer.cs b/Magico.Native/Initializer.cs
@@ -53,12 +53,27 @@ internal static void InitializeNative()
             if (PlatformHelper.IsOnWindows())
             {
                 string gnuRxPath = GetLibraryPath(LibraryGnuRxName);
+                string gnuRxTrePath = GetLibraryPath("libsystre-0");
+                string trePath = GetLibraryPath("libtre-5");
+                string intlPath = GetLibraryPath("libintl-8");
+                string convPath = GetLibraryPath("libiconv-2");
+                string gccPath = GetLibraryPath("libgcc_s_dw2-1");
                 if (File.Exists(gnuRxPath))
                 {
                     var libManagerGnuRx = new LibraryManager(
-                        new LibraryItem(Platform.Windows, Architecture.X64, new LibraryFile(gnuRxPath)),
-                        new LibraryItem(Platform.Windows, Architecture.X86, new LibraryFile(gnuRxPath)),
-                        new LibraryItem(Platform.Windows, Architecture.Arm64, new LibraryFile(gnuRxPath)));
+                        new LibraryItem(Platform.Windows, Architecture.X64,
+                            new LibraryFile(convPath),
+                            new LibraryFile(intlPath),
+                            new LibraryFile(trePath),
+                            new LibraryFile(gnuRxTrePath)),
+                        new LibraryItem(Platform.Windows, Architecture.X86,
+                            new LibraryFile(gccPath),
+                            new LibraryFile(gnuRxPath)),
+                        new LibraryItem(Platform.Windows, Architecture.Arm64,
+                            new LibraryFile(convPath),
+                            new LibraryFile(intlPath),
+                            new LibraryFile(trePath),
+                            new LibraryFile(gnuRxTrePath)));
                     libManagerGnuRx.LoadNativeLibrary();
                 }
             }

diff --git a/Magico.Native/runtimes/win-arm64/native/libiconv-2.dll b/Magico.Native/runtimes/win-arm64/native/libiconv-2.dll
diff --git a/Magico.Native/runtimes/win-arm64/native/libintl-8.dll b/Magico.Native/runtimes/win-arm64/native/libintl-8.dll
diff --git a/Magico.Native/runtimes/win-arm64/native/libsystre-0.dll b/Magico.Native/runtimes/win-arm64/native/libsystre-0.dll
diff --git a/Magico.Native/runtimes/win-arm64/native/libtre-5.dll b/Magico.Native/runtimes/win-arm64/native/libtre-5.dll
diff --git a/Magico.Native/runtimes/win-x64/native/libiconv-2.dll b/Magico.Native/runtimes/win-x64/native/libiconv-2.dll
diff --git a/Magico.Native/runtimes/win-x64/native/libintl-8.dll b/Magico.Native/runtimes/win-x64/native/libintl-8.dll
diff --git a/Magico.Native/runtimes/win-x64/native/libsystre-0.dll b/Magico.Native/runtimes/win-x64/native/libsystre-0.dll
diff --git a/Magico.Native/runtimes/win-x64/native/libtre-5.dll b/Magico.Native/runtimes/win-x64/native/libtre-5.dll
diff --git a/Magico.Native/runtimes/win-x86/native/libgcc_s_dw2-1.dll b/Magico.Native/runtimes/win-x86/native/libgcc_s_dw2-1.dll