lib loading fix

SovereignShop · Apr 1, 2024 · 0e38011 · 0e38011
1 parent 2cefb8f
commit 0e38011
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/bindings/java/src/main/java/manifold3d/Manifold.java b/bindings/java/src/main/java/manifold3d/Manifold.java
@@ -45,6 +45,9 @@ public class Manifold extends Pointer {
         String osName = System.getProperty("os.name").toLowerCase();
         if (osName.contains("linux")) {
             try {
+                System.load(Loader.extractResource("/libfreetype.so", null, "libfreetype", ".so").getAbsolutePath());
+                System.load(Loader.extractResource("/libTextToPolygon.so", null, "libTextToPolygon", ".so").getAbsolutePath());
+                System.load(Loader.extractResource("/libmeshIO.so", null, "libmeshIO", ".so").getAbsolutePath());
                 System.load(Loader.extractResource("/libmeshIO.so", null, "libmeshIO", ".so").getAbsolutePath());
                 System.load(Loader.extractResource("/libClipper2.so", null, "libClipper2", ".so").getAbsolutePath());
                 System.load(Loader.extractResource("/libmanifold.so", null, "libmanifold", ".so").getAbsolutePath());
@@ -65,6 +68,10 @@ public class Manifold extends Pointer {
             }
         } else if (osName.contains("mac")) {
             try {
+                System.out.println("Loading freetype");
+                System.load(Loader.extractResource("/libfreetype.6.16.0.dylib", null, "libfreetype", ".dylib").getAbsolutePath());
+                System.out.println("Loading textToPolygon");
+                System.load(Loader.extractResource("/libTextToPolygon.dylib", null, "libTextToPolygon", ".dylib").getAbsolutePath());
                 System.out.println("Loading meshIO");
                 System.load(Loader.extractResource("/libmeshIO.dylib", null, "libmeshIO", ".dylib").getAbsolutePath());
                 System.out.println("Loading Manifold");

diff --git a/bindings/java/version.txt b/bindings/java/version.txt
@@ -1 +1 @@
-1.0.76
+1.0.77
diff --git a/manifoldDeps.cmake b/manifoldDeps.cmake
@@ -40,7 +40,7 @@ endif()
 FetchContent_Declare(
   TextToPolygon
   GIT_REPOSITORY https://github.com/SovereignShop/text-to-polygon.git
-  GIT_TAG 670e4a71ba3dd1de2f7edcf73f748ab4eeec3828
+  GIT_TAG 5d8f0b4bf9b539bcf0eadcea5ea8e6c741343779
 )
 FetchContent_MakeAvailable(TextToPolygon)