Mac debugging

SovereignShop · Mar 10, 2024 · dcd14ff · dcd14ff
1 parent e13cf3d
commit dcd14ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/manifold.yml b/.github/workflows/manifold.yml
@@ -314,7 +314,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake -DOUTPUT_TO_BIN=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DMANIFOLD_EXPORT=ON -DMANIFOLD_PAR=${{matrix.parallel_backend}} .. && make
+        cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DMANIFOLD_EXPORT=ON -DMANIFOLD_PAR=${{matrix.parallel_backend}} .. && make
       shell: bash
     - name: Find Libs
       run: |

diff --git a/bindings/java/src/main/java/manifold3d/Manifold.java b/bindings/java/src/main/java/manifold3d/Manifold.java
@@ -35,7 +35,7 @@
 @Platform(compiler = "cpp17", include = {"manifold.h", "meshIO.h"},
           linkpath = { LibraryPaths.MANIFOLD_LIB_DIR,
                        LibraryPaths.MANIFOLD_LIB_DIR_WINDOWS },
-          link = { "manifold" })
+          link = { "manifold", "Clipper2" })
 @Namespace("manifold")
 public class Manifold extends Pointer {
     static {
@@ -65,10 +65,10 @@ public class Manifold extends Pointer {
             try {
                 System.out.println("Loading meshIO");
                 System.load(Loader.extractResource("/libmeshIO.dylib", null, "libmeshIO", ".dylib").getAbsolutePath());
-                System.out.println("Loading Clipper");
-                System.load(Loader.extractResource("/libClipper2.1.3.0.dylib", null, "libClipper2", ".dylib").getAbsolutePath());
                 System.out.println("Loading Manifold");
                 System.load(Loader.extractResource("/libmanifold.2.4.5.dylib", null, "libmanifold", ".dylib").getAbsolutePath());
+                System.out.println("Loading Clipper");
+                System.load(Loader.extractResource("/libClipper2.1.3.0.dylib", null, "libClipper2", ".dylib").getAbsolutePath());
                 System.out.println("Finished Loading.");
 
             } catch (IOException e) {